Преглед изворни кода

버그 수정

https://github.com/openNAMU/openNAMU/issues/2069
잉여개발기 (SPDV) пре 2 година
родитељ
комит
78248276aa
4 измењених фајлова са 32 додато и 30 уклоњено
  1. 9 5
      route/tool/func.py
  2. 20 22
      route/topic.py
  3. 1 1
      version.json
  4. 2 2
      views/main_css/js/func/insert_user_info.js

+ 9 - 5
route/tool/func.py

@@ -1819,14 +1819,17 @@ def admin_check(num = None, what = None, name = ''):
 
         return 0
 
-def acl_check(name = 'test', tool = '', topic_num = '1'):
+def acl_check(name = '', tool = '', topic_num = '1'):
     with get_db_connect() as conn:
         curs = conn.cursor()
 
+        if name == None:
+            name = ''
+
         ip = ip_check()
         get_ban = ban_check()
         
-        if tool == '' and name:
+        if tool == '' and name != '':
             if acl_check(name, 'render') == 1:
                 return 1
             
@@ -1858,9 +1861,10 @@ def acl_check(name = 'test', tool = '', topic_num = '1'):
             if acl_check(name, 'bbs_view') == 1:
                 return 1
         elif tool == 'topic':
-            curs.execute(db_change("select title from rd where code = ?"), [topic_num])
-            name = curs.fetchall()
-            name = name[0][0] if name else 'test'
+            if name == '':
+                curs.execute(db_change("select title from rd where code = ?"), [topic_num])
+                name = curs.fetchall()
+                name = name[0][0] if name else 'test'
 
         if tool in ['topic']:
             end = 3

+ 20 - 22
route/topic.py

@@ -9,7 +9,25 @@ def topic(topic_num = 0, do_type = '', doc_name = 'Test'):
         curs = conn.cursor()
         topic_num = str(topic_num)
 
-        topic_acl = acl_check('', 'topic', topic_num)
+        if topic_num == '0':
+            name = load_lang('make_new_topic')
+            sub = load_lang('make_new_topic')
+
+            name_value = doc_name
+            sub_value = ''
+        else:
+            curs.execute(db_change("select title, sub from rd where code = ?"), [topic_num])
+            name = curs.fetchall()
+            if name:
+                sub = name[0][1]
+                name = name[0][0]
+
+                name_value = name
+                sub_value = sub
+            else:
+                return redirect('/')
+                
+        topic_acl = acl_check(name_value, 'topic', topic_num)
         topic_view_acl = acl_check('', 'topic_view', topic_num)
         if topic_view_acl == 1:
             return re_error('/ban')
@@ -99,26 +117,6 @@ def topic(topic_num = 0, do_type = '', doc_name = 'Test'):
 
             return redirect('/thread/' + topic_num + '#' + num)
         else:
-            thread_data = ''
-
-            if topic_num == '0':
-                name = load_lang('make_new_topic')
-                sub = load_lang('make_new_topic')
-
-                name_value = doc_name
-                sub_value = ''
-            else:
-                curs.execute(db_change("select title, sub from rd where code = ?"), [topic_num])
-                name = curs.fetchall()
-                if name:
-                    sub = name[0][1]
-                    name = name[0][0]
-
-                    name_value = name
-                    sub_value = sub
-                else:
-                    return redirect('/')
-
             acl_display = 'display: none;' if topic_acl == 1 else ''
             name_display = 'display: none;' if topic_num != '0' else ''
 
@@ -168,7 +166,7 @@ def topic(topic_num = 0, do_type = '', doc_name = 'Test'):
                             <hr class="main_hr">
                         </div>
                         
-                        ''' + edit_editor(curs, ip, thread_data, 'thread') + '''
+                        ''' + edit_editor(curs, ip, '', 'thread') + '''
                     </form>
                 ''',
                 menu = [['topic/' + url_pas(name), load_lang('list')]]

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-dev9",
+        "r_ver" : "v3.5.0-dev10",
         "c_ver" : "3500374",
         "s_ver" : "3500113"
     }

+ 2 - 2
views/main_css/js/func/insert_user_info.js

@@ -44,9 +44,9 @@ function do_insert_user_info_sub(name, lang_data_list, lang_data = {}, for_a = 0
                 
                 get_data_ban += lang_data['period'] + ' : ';
                 if(data['data']['ban']['period'] === '0') {
-                    get_data_ban += lang_data['limitless']; 
+                    get_data_ban += '~ ' + lang_data['limitless']; 
                 } else {
-                    get_data_ban += data['data']['ban']['period'];
+                    get_data_ban += '~ ' + data['data']['ban']['period'];
                 }
                 get_data_ban += '<br>';