2du 3 лет назад
Родитель
Сommit
b24fdc97a6
5 измененных файлов с 8 добавлено и 5 удалено
  1. 1 0
      app.py
  2. 2 2
      route/topic.py
  3. 1 1
      route/topic_list.py
  4. 3 1
      route/user_alarm.py
  5. 1 1
      version.json

+ 1 - 0
app.py

@@ -471,6 +471,7 @@ app.route('/recent_discuss/open', defaults = { 'tool' : 'open' })(recent_discuss
 app.route('/recent_discuss/delete')(recent_discuss_delete)
 
 app.route('/thread/<int:topic_num>', methods = ['POST', 'GET'])(topic)
+app.route('/thread/0/<everything:doc_name>', defaults = { 'topic_num' : '0' }, methods = ['POST', 'GET'])(topic)
 app.route('/thread_preview/<int:topic_num>', defaults = { 'do_type' : 'preview' }, methods = ['POST'])(topic)
 app.route('/topic/<everything:name>', methods = ['POST', 'GET'])(topic_list)
 

+ 2 - 2
route/topic.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def topic(topic_num = 0, do_type = ''):
+def topic(topic_num = 0, do_type = '', doc_name = 'Test'):
     with get_db_connect() as conn:
         curs = conn.cursor()
         topic_num = str(topic_num)
@@ -141,7 +141,7 @@ def topic(topic_num = 0, do_type = ''):
                     name_value = flask.request.form.get('topic', '')
                     sub_value = flask.request.form.get('title', '')
                 else:
-                    name_value = ''
+                    name_value = doc_name
                     sub_value = ''
             else:
                 curs.execute(db_change("select title, sub from rd where code = ?"), [topic_num])

+ 1 - 1
route/topic_list.py

@@ -26,7 +26,7 @@ def topic_list(name = 'Test'):
                 <a href="/topic/''' + url_pas(name) + '?tool=close">(' + load_lang('closed_discussion') + ''')</a>
                 <a href="/topic/''' + url_pas(name) + '?tool=agree">(' + load_lang('agreed_discussion') + ''')</a>
                 <hr class="main_hr">
-                <a href="/thread/0">(''' + load_lang('make_new_topic') + ''')</a>
+                <a href="/thread/0/''' + url_pas(name) + '''">(''' + load_lang('make_new_topic') + ''')</a>
             '''
 
             curs.execute(db_change("select code, sub from rd where title = ? and stop != 'O' order by date desc"), [name])

+ 3 - 1
route/user_alarm.py

@@ -19,7 +19,9 @@ def user_alarm():
             ''
     
             for data_one in data_list:
-                data += '<li>' + data_one[0] + ' (' + data_one[1] + ')</li>'
+                data_split = data_one[0].split(' | ')
+                
+                data += '<li>' + ip_pas(data_split[0]) + (' | ' + ' | '.join(data_split[1:]) if len(data_split) > 1 else '') + ' (' + data_one[1] + ')</li>'
     
         data += '' + \
             '</ul>' + \

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.5-unstable (stable2) (beta5-69)",
+        "r_ver" : "v3.4.5-unstable (stable2) (beta5-70)",
         "c_ver" : "3500354",
         "s_ver" : "3500110"
     }