Bläddra i källkod

user_info 임시로 다시 정상화

잉여개발기 (SPDV) 2 år sedan
förälder
incheckning
fa770f2962
3 ändrade filer med 27 tillägg och 37 borttagningar
  1. 21 1
      route/api_user_info.py
  2. 1 1
      route/tool/func.py
  3. 5 35
      views/main_css/js/func/insert_user_info.js

+ 21 - 1
route/api_user_info.py

@@ -94,5 +94,25 @@ def api_user_info(user_name = ''):
             data_result['user_title'] = db_data[0][0]
         else:
             data_result['user_title'] = ''
+
+        lang_data_list = [
+            'user_name',
+            'authority',
+            'state',
+            'member',
+            'normal',
+            'blocked',
+            'type',
+            'regex',
+            'period',
+            'limitless',
+            'login_able',
+            'why',
+            'band_blocked',
+            'ip',
+            'ban',
+            'level'
+        ]
+        lang_data = { for_a : load_lang(for_a) for for_a in lang_data_list }
                 
-        return flask.jsonify({ 'data' : data_result })
+        return flask.jsonify({ 'data' : data_result, 'language' : lang_data })

+ 1 - 1
route/tool/func.py

@@ -1045,7 +1045,7 @@ def wiki_css(data):
     data_css = ''
     data_css_dark = ''
 
-    data_css_ver = '199'
+    data_css_ver = '200'
     data_css_ver = '.cache_v' + data_css_ver
 
     if 'main_css' in global_wiki_set:

+ 5 - 35
views/main_css/js/func/insert_user_info.js

@@ -1,18 +1,14 @@
 "use strict";
 
-function do_insert_user_info_sub(name, lang_data_list, lang_data = {}, for_a = 0) {
-    if(lang_data_list[for_a]) {
-        fetch("/api/lang/" + lang_data_list[for_a]).then(function(res) {
-            return res.json();
-        }).then(function(data) {
-            lang_data[lang_data_list[for_a]] = data['data'];
+function do_insert_user_info() {
+    if(document.getElementById('opennamu_get_user_info')) {
+        let name = document.getElementById('opennamu_get_user_info').innerHTML;
 
-            do_insert_user_info_sub(name, lang_data_list, lang_data, for_a + 1);
-        });
-    } else {
         fetch("/api/user_info/" + opennamu_do_url_encode(name)).then(function(res) {
             return res.json();
         }).then(function(data) {
+            let lang_data = data["language"];
+
             let get_data_auth = data['data']['auth'];
             if(get_data_auth === '0') {
                 get_data_auth = lang_data['ip'];
@@ -91,30 +87,4 @@ function do_insert_user_info_sub(name, lang_data_list, lang_data = {}, for_a = 0
     }
 }
 
-function do_insert_user_info() {
-    if(document.getElementById('opennamu_get_user_info')) {
-        let name = document.getElementById('opennamu_get_user_info').innerHTML;
-        let lang_data_list = [
-            'user_name',
-            'authority',
-            'state',
-            'member',
-            'normal',
-            'blocked',
-            'type',
-            'regex',
-            'period',
-            'limitless',
-            'login_able',
-            'why',
-            'band_blocked',
-            'ip',
-            'ban',
-            'level'
-        ];
-
-        do_insert_user_info_sub(name, lang_data_list);
-    }
-}
-
 do_insert_user_info();