Просмотр исходного кода

https://github.com/openNAMU/openNAMU/issues/1786

잉여개발기 (SPDV) 3 лет назад
Родитель
Сommit
3307cf9190

+ 1 - 0
route/bbs_edit.py

@@ -77,6 +77,7 @@ def bbs_edit(bbs_num = '', post_num = '', do_type = ''):
                 else:
                     curs.execute(db_change('select set_name, set_data, set_code from bbs_data where set_id = ? and set_code = ?'), [bbs_num, post_num])
                     db_data = curs.fetchall()
+                    db_data = list(db_data) if db_data else []
 
                     temp_id = ''
                     temp_dict = {}

+ 2 - 0
route/bbs_w.py

@@ -25,6 +25,8 @@ def bbs_w(bbs_num = ''):
 
         curs.execute(db_change('select set_name, set_data, set_code from bbs_data where set_id = ? order by set_code + 0 desc'), [bbs_num])
         db_data = curs.fetchall()
+        db_data = list(db_data) if db_data else []
+
         for for_a in db_data + [['', '', '']]:
             if temp_id != for_a[2]:
                 if temp_id != '':

+ 4 - 0
route/bbs_w_post.py

@@ -94,6 +94,7 @@ def bbs_w_post(bbs_num = '', post_num = '', do_type = ''):
                 temp_id = ''
                 temp_dict = {}
 
+                db_data = list(db_data) if db_data else []
                 for for_a in db_data + [['', '', '']]:
                     if temp_id != for_a[2]:
                         temp_id = for_a[2]
@@ -125,6 +126,8 @@ def bbs_w_post(bbs_num = '', post_num = '', do_type = ''):
 
                 curs.execute(db_change('select set_name, set_data, set_code, set_id from bbs_data where (set_name = "comment" or set_name = "comment_date" or set_name = "comment_user_id") and set_id = ? order by set_code + 0 asc'), [bbs_num_str + '-' + post_num_str])
                 db_data = curs.fetchall()
+                db_data = list(db_data) if db_data else []
+
                 for for_a in db_data + [['', '', '']]:
                     if temp_id == '':
                         temp_id = for_a[2]
@@ -251,6 +254,7 @@ def bbs_w_post(bbs_num = '', post_num = '', do_type = ''):
                 temp_id = ''
                 temp_dict = {}
 
+                db_data = list(db_data) if db_data else []
                 for for_a in db_data + [['', '', '']]:
                     if temp_id != for_a[2]:
                         temp_id = for_a[2]

+ 1 - 1
route/list_acl.py

@@ -30,7 +30,7 @@ def list_acl(arg_num = 1):
             ''
 
         div += '</ul>'
-        div += next_fix('/list/document/acl/', num, list_data)
+        div += next_fix('/list/document/acl/', arg_num, list_data)
 
         return easy_minify(flask.render_template(skin_check(),
             imp = [load_lang('acl_document_list'), wiki_set(), wiki_custom(), wiki_css([0, 0])],

+ 0 - 1
route/list_image_file.py

@@ -8,7 +8,6 @@ def list_image_file():
         sql_num = (num * 50 - 50) if num * 50 > 0 else 0
 
         list_data = '<ul class="opennamu_ul">'
-        back = ''
 
         curs.execute(db_change("select title from data where title like 'file:%' limit ?, 50"), [sql_num])
         data_list = curs.fetchall()

+ 1 - 1
route/list_please.py

@@ -22,7 +22,7 @@ def list_please(arg_num = 1):
                 '</li>' + \
             ''
 
-        div += '</ul>' + next_fix('/list/document/need/', num, data_list)
+        div += '</ul>' + next_fix('/list/document/need/', arg_num, data_list)
 
         return easy_minify(flask.render_template(skin_check(),
             imp = [load_lang('need_document'), wiki_set(), wiki_custom(), wiki_css([0, 0])],

+ 1 - 1
route/list_user.py

@@ -17,7 +17,7 @@ def list_user(arg_num = 1):
                 '</li>' + \
             ''
 
-        list_data += '</ul>' + next_fix('/list/user/', num, user_list)
+        list_data += '</ul>' + next_fix('/list/user/', arg_num, user_list)
 
         return easy_minify(flask.render_template(skin_check(),
             imp = [load_lang('member_list'), wiki_set(), wiki_custom(), wiki_css([0, 0])],

+ 2 - 0
route/tool/func.py

@@ -1895,6 +1895,8 @@ def acl_check(name = 'test', tool = '', topic_num = '1'):
             num = 'all'
         elif tool == 'bbs_view':
             curs.execute(db_change('select set_data from bbs_set where set_name = "bbs_view_acl" and set_id = ?'), [name])
+
+            num = 'all'
         else:
             # tool == 'render'
             if i == 0:

+ 1 - 0
route/tool/func_render_namumark.py

@@ -1348,6 +1348,7 @@ class class_do_render_namumark:
                         table_parameter_all['table'] += 'background:' + self.get_tool_dark_mode_split(table_parameter_data) + ';'
                     elif table_parameter_name == 'tablewidth':
                         table_parameter_all['div'] += 'width:' + self.get_tool_px_add_check(table_parameter_data) + ';'
+                        table_parameter_all['table'] += 'width:100%;'
                     elif table_parameter_name == 'tableheight':
                         table_parameter_all['table'] += 'height:' + self.get_tool_px_add_check(table_parameter_data) + ';'
                     elif table_parameter_name == 'tablealign':

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC3-dev172",
+        "r_ver" : "v3.4.6-RC3-dev173",
         "c_ver" : "3500361",
         "s_ver" : "3500111"
     }