Browse Source

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

잉여개발기 (SPDV) 3 years ago
parent
commit
87579655cd
2 changed files with 14 additions and 17 deletions
  1. 9 9
      route/main_setting_skin_set.py
  2. 5 8
      route/user_setting_skin_set_main.py

+ 9 - 9
route/main_setting_skin_set.py

@@ -34,16 +34,16 @@ def main_setting_skin_set():
             set_data = {}
             for for_b in set_list:
                 set_data[for_b] = ''
-                get_data = ''
 
-                if set_list[for_b][0] == ['']:
-                    set_data[for_b] = get_data
-                else:
-                    for for_a in set_list[for_b]:
-                        if get_data == for_a[0]:
-                            set_data[for_b] = '<option value="' + for_a[0] + '">' + for_a[1] + '</option>' + set_data[for_b]
-                        else:
-                            set_data[for_b] += '<option value="' + for_a[0] + '">' + for_a[1] + '</option>'
+                curs.execute(db_change('select data from other where name = ?'), [for_b])
+                db_data = curs.fetchall()
+                get_data = db_data[0][0] if db_data else ''
+
+                for for_a in set_list[for_b]:
+                    if get_data == for_a[0]:
+                        set_data[for_b] = '<option value="' + for_a[0] + '">' + for_a[1] + '</option>' + set_data[for_b]
+                    else:
+                        set_data[for_b] += '<option value="' + for_a[0] + '">' + for_a[1] + '</option>'
 
             return easy_minify(flask.render_template(skin_check(),
                 imp = [load_lang('main_skin_set_default'), wiki_set(), wiki_custom(), wiki_css(['(' + load_lang('beta') + ')', 0])],

+ 5 - 8
route/user_setting_skin_set_main.py

@@ -110,14 +110,11 @@ def user_setting_skin_set_main():
                 else:
                     get_data = flask.session[for_b] if for_b in flask.session else ''
 
-                if set_list[for_b][0] == ['']:
-                    set_data[for_b] = get_data
-                else:
-                    for for_a in set_list[for_b]:
-                        if get_data == for_a[0]:
-                            set_data[for_b] = '<option value="' + for_a[0] + '">' + for_a[1] + '</option>' + set_data[for_b]
-                        else:
-                            set_data[for_b] += '<option value="' + for_a[0] + '">' + for_a[1] + '</option>'
+                for for_a in set_list[for_b]:
+                    if get_data == for_a[0]:
+                        set_data[for_b] = '<option value="' + for_a[0] + '">' + for_a[1] + '</option>' + set_data[for_b]
+                    else:
+                        set_data[for_b] += '<option value="' + for_a[0] + '">' + for_a[1] + '</option>'
 
             return easy_minify(flask.render_template(skin_check(),
                 imp = [load_lang('main_skin_set'), wiki_set(), wiki_custom(), wiki_css([0, 0])],