Parcourir la source

버그 수정

Surplus_Up (2DU) il y a 6 ans
Parent
commit
73dc7c4d5e
6 fichiers modifiés avec 48 ajouts et 25 suppressions
  1. 1 1
      app.py
  2. 9 3
      route/give_acl.py
  3. 22 6
      route/list_user_topic.py
  4. 4 2
      route/tool/func.py
  5. 1 1
      version.json
  6. 11 12
      views/main_css/js/load_namumark.js

+ 1 - 1
app.py

@@ -601,7 +601,7 @@ def view_read(name = None):
     return view_read_2(conn, name)
 
 @app.route('/topic_record/<name>')
-def list_user_topic(name = None):
+def list_user_topic(name = 'test'):
     return list_user_topic_2(conn, name)
 
 @app.route('/recent_changes')

+ 9 - 3
route/give_acl.py

@@ -127,13 +127,19 @@ def give_acl_2(conn, name):
 
             if check_ok == '':
                 if acl_data:
-                    data += '<hr class=\"main_hr\"><input value="' + html.escape(acl_data[0][1]) + '" placeholder="' + load_lang('why') + '" name="why" type="text" ' + check_ok + '>'
+                    data += '' + \
+                        '<hr class=\"main_hr\">' + \
+                        '<input value="' + html.escape(acl_data[0][1]) + '" placeholder="' + load_lang('why') + '" name="why" type="text" ' + check_ok + '>' + \
+                    ''
                 else:
-                    data += '<hr class=\"main_hr\"><input placeholder="' + load_lang('why') + '" name="why" type="text" ' + check_ok + '>'
+                    data += '' + \
+                        '<hr class=\"main_hr\">' + \
+                        '<input placeholder="' + load_lang('why') + '" name="why" type="text" ' + check_ok + '>' + \
+                    ''
 
         return easy_minify(flask.render_template(skin_check(),
             imp = [name, wiki_set(), custom(), other2([' (' + load_lang('acl') + ')', 0])],
-            data =  '''
+            data = '''
                 <form method="post">
                     <a href="/setting/8">(''' + load_lang('main_acl_setting') + ''')</a>
                     ''' + data + '''

+ 22 - 6
route/list_user_topic.py

@@ -18,24 +18,40 @@ def list_user_topic_2(conn, name):
                     <td id="main_table_width">''' + load_lang('time') + '''</td>
                 </tr>
     '''
+    sub = '(' + html.escape(name) + ')'
+    pas_name = ip_pas(name)
 
-    curs.execute(db_change("select code, id, ip, date from topic where ip = ? order by date desc limit ?, 50"), [name, sql_num])
+    curs.execute(db_change("select code, id, date from topic where ip = ? order by date desc limit ?, 50"), [name, sql_num])
     data_list = curs.fetchall()
     for data in data_list:
         title = html.escape(data[0])
-        sub = html.escape(data[2])
 
         curs.execute(db_change("select title, sub from rd where code = ?"), [data[0]])
         other_data = curs.fetchall()
         
-        div += '<tr><td><a href="/thread/' + data[0] + '#' + data[1] + '">' + other_data[0][1] + '#' + data[1] + '</a> (' + other_data[0][0] + ')</td>'
-        div += '<td>' + ip_pas(data[2]) + '</td><td>' + data[3] + '</td></tr>'
+        div += '' + \
+            '<tr>' + \
+                '<td>' + \
+                    '<a href="/thread/' + data[0] + '#' + data[1] + '">' + other_data[0][1] + '#' + data[1] + '</a> (' + other_data[0][0] + ')' + \
+                '</td>' + \
+                '<td>' + pas_name + '</td>' + \
+                '<td>' + data[2] + '</td>' + \
+            '</tr>' + \
+        ''
 
-    div += '</tbody></table>'
+    div += '' + \
+            '</tbody>' + \
+        '</table>' + \
+    ''
     div += next_fix('/topic_record/' + url_pas(name) + '?num=', num, data_list)
     
     return easy_minify(flask.render_template(skin_check(),
         imp = [load_lang('discussion_record'), wiki_set(), custom(), other2([sub, 0])],
         data = div,
-        menu = [['other', load_lang('other')], ['user', load_lang('user')], ['count/' + url_pas(name), load_lang('count')], ['record/' + url_pas(name), load_lang('record')]]
+        menu = [
+            ['other', load_lang('other')], 
+            ['user', load_lang('user')], 
+            ['count/' + url_pas(name), load_lang('count')], 
+            ['record/' + url_pas(name), load_lang('record')]
+        ]
     ))

+ 4 - 2
route/tool/func.py

@@ -496,9 +496,11 @@ def other2(data):
         data += ['']
 
     req_list = ''
-    main_css_ver = 43
+    main_css_ver = 44
 
-    if not 'main_css_load' in flask.session or not 'main_css_ver' in flask.session or flask.session['main_css_ver'] != main_css_ver:
+    if  not 'main_css_load' in flask.session or \
+        not 'main_css_ver' in flask.session or \
+        flask.session['main_css_ver'] != main_css_ver:
         for i_data in os.listdir(os.path.join("views", "main_css", "css")):
             req_list += '<link rel="stylesheet" href="/views/main_css/css/' + i_data + '?ver=' + str(main_css_ver) + '">'
 

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.8-master-45",
+        "r_ver" : "v3.1.8-master-46",
         "c_ver" : "3184400",
         "s_ver" : "8"
     }, "stable" : {

+ 11 - 12
views/main_css/js/load_namumark.js

@@ -1,8 +1,6 @@
 function get_link_state(data, i = 0) { 
     var get_class = document.getElementsByClassName(data + 'link_finder')[i];
     if(get_class) {
-        get_link_state(data, i + 1);
-
         var xhr = new XMLHttpRequest();
         xhr.open(
             "GET", 
@@ -20,14 +18,14 @@ function get_link_state(data, i = 0) {
                 }
             }
         }
+
+        get_link_state(data, i + 1);
     }
 }
 
 function get_file_state(data, i = 0) {       
     var get_class = document.getElementsByClassName(data + 'file_finder')[i];
-    if(get_class) {        
-        get_file_state(data, i + 1);
-    
+    if(get_class) {            
         if(get_class.getAttribute('under_href') === 'out_link') {
             if(
                 document.cookie.match(main_css_regex_data('main_css_image_set')) &&
@@ -84,6 +82,8 @@ function get_file_state(data, i = 0) {
                 }
             }
         }
+
+        get_file_state(data, i + 1);
     }
 }
 
@@ -106,7 +106,9 @@ function load_include(title, name, p_data) {
                 document.getElementsByClassName(name)[0].id = "not_thing";
             } else {
                 var o_p_data = JSON.parse(this.responseText);
+                
                 document.getElementById(name).innerHTML = o_p_data['data'];
+                
                 eval(o_p_data['js_data']);
             }
         }
@@ -123,13 +125,10 @@ function page_count() {
     xhr.onreadystatechange = function() {
         if(this.readyState === 4 && this.status === 200) {
             var i = 0;
-            while(1) {
-                if(document.getElementsByClassName('all_page_count')[i]) {
-                    document.getElementsByClassName('all_page_count')[i].innerHTML = JSON.parse(this.responseText)['count'];
-                    i += 1;
-                } else {
-                    break;
-                }
+            while(document.getElementsByClassName('all_page_count')[i]) {
+                document.getElementsByClassName('all_page_count')[i].innerHTML = JSON.parse(this.responseText)['count'];
+                
+                i += 1;
             }
         }
     }