2du 4 vuotta sitten
vanhempi
sitoutus
c9be5a2c80
6 muutettua tiedostoa jossa 41 lisäystä ja 25 poistoa
  1. 5 5
      app.py
  2. 1 0
      route/main_manager.py
  3. 23 11
      route/tool/func.py
  4. 11 7
      route/user_setting.py
  5. 1 1
      version.json
  6. 0 1
      views/main_css/js/render_onmark.js

+ 5 - 5
app.py

@@ -180,11 +180,6 @@ if setup_tool != 'normal':
 set_init_always(version_list['beta']['c_ver'])
 
 # Init-Route
-app = flask.Flask(__name__, template_folder = './')
-app.config['JSON_AS_ASCII'] = False
-
-app.logger.setLevel(logging.ERROR)
-
 class EverythingConverter(werkzeug.routing.PathConverter):
     regex = '.*?'
 
@@ -192,6 +187,11 @@ class RegexConverter(werkzeug.routing.BaseConverter):
     def __init__(self, url_map, *items):
         super(RegexConverter, self).__init__(url_map)
         self.regex = items[0]
+        
+app = flask.Flask(__name__, template_folder = './')
+app.config['JSON_AS_ASCII'] = False
+
+app.logger.setLevel(logging.ERROR)
 
 app.jinja_env.filters['md5_replace'] = md5_replace
 app.jinja_env.filters['load_lang'] = load_lang

+ 1 - 0
route/main_manager.py

@@ -39,6 +39,7 @@ def main_manager_2(conn, num, r_ver):
                 <ul class="inside_ul">
                     <li><a href="/admin_group">''' + load_lang('admin_group_list') + '''</a></li>
                     <li><a href="/many_delete">''' + load_lang('many_delete') + '''</a></li>
+                    <li><a href="/many_delete_history">''' + load_lang('many_history_delete') + '''</a></li>
                     <li><a href="/applications">''' + load_lang('application_list') + '''</a></li>
                     <li><a href="/api/sitemap.xml">''' + load_lang('get_sitemap') + '''</a></li>
                     <li><a href="/register">''' + load_lang('add_user') + '''</a></li>

+ 23 - 11
route/tool/func.py

@@ -661,16 +661,14 @@ def skin_check(set_n = 0):
     ip = ip_check()
     
     user_need_skin = ''
-    
-    if 'skin' in flask.session:
-        user_need_skin = flask.session['skin']
+    if ip_or_user(ip) == 0:
+        curs.execute(db_change('select data from user_set where name = "skin" and id = ?'), [ip])
+        skin_exist = curs.fetchall()
+        if skin_exist:
+            user_need_skin = skin_exist[0][0]            
     else:
-        if ip_or_user(ip) == 0:
-            curs.execute(db_change('select data from user_set where name = "skin" and id = ?'), [ip])
-            skin_exist = curs.fetchall()
-            if skin_exist:
-                user_need_skin = skin_exist[0][0]            
-                flask.session['skin'] = user_need_skin
+        if 'skin' in flask.session:
+            user_need_skin = flask.session['skin']
 
     if user_need_skin == '':
         curs.execute(db_change('select data from other where name = "skin"'))
@@ -863,9 +861,23 @@ def load_skin(data = '', set_n = 0, default = 0):
 
         if skin_data != 'main_css':
             if set_n == 0:
-                skin_return_data += '<option value="' + skin_data + '">' + see_data + '</option>'
+                if skin_data == data:
+                    skin_return_data = '' + \
+                        '<option value="' + skin_data + '">' + \
+                            see_data + \
+                        '</option>' + \
+                    '' + skin_return_data
+                else:
+                    skin_return_data += '' + \
+                        '<option value="' + skin_data + '">' + \
+                            see_data + \
+                        '</option>' + \
+                    ''
             else:
-                skin_return_data += [skin_data]                    
+                if skin_data == data:
+                    skin_return_data = [skin_data] + skin_return_data
+                else:
+                    skin_return_data += [skin_data]                    
 
     return skin_return_data
 

+ 11 - 7
route/user_setting.py

@@ -46,13 +46,14 @@ def user_setting_2(conn, server_init):
             data = curs.fetchall()
             email = data[0][0] if data else '-'
 
-            div2 = load_skin('', 0, 1)
-            div3 = ''
+            curs.execute(db_change('select data from user_set where name = "skin" and id = ?'), [ip])
+            data = curs.fetchall()
+            div2 = load_skin(data[0][0] if data else '', 0, 1)
 
-            curs.execute(db_change('select data from user_set where name = "lang" and id = ?'), [ip_check()])
+            curs.execute(db_change('select data from user_set where name = "lang" and id = ?'), [ip])
             data = curs.fetchall()
             data = [['default']] if not data else data
-
+            div3 = ''
             for lang_data in support_language:
                 see_data = lang_data if lang_data != 'default' else load_lang('default')
                 
@@ -108,11 +109,14 @@ def user_setting_2(conn, server_init):
             
             return redirect('/change')
         else:
-            div2 = load_skin(('' if not 'skin' in flask.session else flask.session['skin']), 0, 1)
-            div3 = ''
+            div2 = load_skin(
+                ('' if not 'skin' in flask.session else flask.session['skin']), 
+                0, 
+                1
+            )
 
             data = [['default']] if not 'lang' in flask.session else [[flask.session['lang']]]
-
+            div3 = ''
             for lang_data in support_language:
                 see_data = lang_data if lang_data != 'default' else load_lang('default')
                 

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.0-stable-01b (beta-01b) (dev-21073101)",
+        "r_ver" : "v3.4.0-stable-01b (beta-01b) (dev-21.07.31-01)",
         "c_ver" : "3400101",
         "s_ver" : "12"
     }

+ 0 - 1
views/main_css/js/render_onmark.js

@@ -1,6 +1,5 @@
 // 인터위키
 // 표 캡션
-// wiki 버그?
 // Tool
 function do_url_change(data) {
     return encodeURIComponent(data);