Explorar el Código

실수한 버그 수정

Surplus_Up (2DU) hace 5 años
padre
commit
3f3087e594
Se han modificado 4 ficheros con 12 adiciones y 20 borrados
  1. 0 0
      data/test
  2. 7 15
      route/tool/func.py
  3. 2 2
      route/view_xref.py
  4. 3 3
      version.json

+ 0 - 0
data/test


+ 7 - 15
route/tool/func.py

@@ -61,6 +61,7 @@ for i in range(0, 2):
             raise
 
 global_lang = {}
+req_list = ''
 
 def load_conn(data):
     global conn
@@ -497,25 +498,16 @@ def next_fix(link, num, page, end = 50):
     return list_data
 
 def other2(data):
-    for _ in range(0, 3 - len(data)):
-        data += ['']
+    global req_list
+    main_css_ver = '49'
+    data += ['' for _ in range(0, 3 - len(data))]
 
-    req_list = ''
-    main_css_ver = 49
-
-    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 req_list == '':
         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) + '">'
+            req_list += '<link rel="stylesheet" href="/views/main_css/css/' + i_data + '?ver=' + main_css_ver + '">'
 
         for i_data in os.listdir(os.path.join("views", "main_css", "js")):
-            req_list += '<script src="/views/main_css/js/' + i_data + '?ver=' + str(main_css_ver) + '"></script>'
-
-        flask.session['main_css_load'] = req_list
-        flask.session['main_css_ver'] = main_css_ver
-    else:
-        req_list = flask.session['main_css_load']
+            req_list += '<script src="/views/main_css/js/' + i_data + '?ver=' + main_css_ver + '"></script>'
 
     data = data[0:2] + ['', '''
         <link   rel="stylesheet"

+ 2 - 2
route/view_xref.py

@@ -22,7 +22,7 @@ def view_xref_2(conn, name):
     if flask.request.args.get('change', '1') == '1':
         curs.execute(db_change("" + \
             "select distinct link, type from back " + \
-            "where title = ? and not type = 'cat' and not type = 'no'" + \
+            "where title = ? and not type = 'cat' and not type = 'no' and not type = 'nothing'" + \
             "order by link asc limit ?, 50" + \
         ""), [
             name,
@@ -31,7 +31,7 @@ def view_xref_2(conn, name):
     else:
         curs.execute(db_change("" + \
             "select distinct title, type from back " + \
-            "where link = ? and not type = 'cat' and not type = 'no'" + \
+            "where link = ? and not type = 'cat' and not type = 'no' and not type = 'nothing'" + \
             "order by link asc limit ?, 50" + \
         ""), [
             name,

+ 3 - 3
version.json

@@ -1,11 +1,11 @@
 {
     "master" : {
-        "r_ver" : "v3.2.0-master-07",
+        "r_ver" : "v3.2.0-stable-03",
         "c_ver" : "3200500",
         "s_ver" : "9"
     }, "stable" : {
-        "r_ver" : "v3.2.0-stable-02",
-        "c_ver" : "3200100",
+        "r_ver" : "v3.2.0-stable-03",
+        "c_ver" : "3200500",
         "s_ver" : "9"
     }
 }