Ver Fonte

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

잉여개발기 (SPDV) há 3 anos atrás
pai
commit
34daa095af

+ 1 - 0
lang/en-US.json

@@ -232,6 +232,7 @@
         "file_delete" : "File delete",
         "added_menu" : "Added menu",
         "document_set" : "Document settings",
+        "user_added_menu" : "User added menu",
         "move_redirect_make" : "Redirect document generation (Only if possible)",
         "_comment_" : "Edit",
             "load" : "Load another document",

+ 1 - 0
lang/ko-KR.json

@@ -492,6 +492,7 @@
     "namumark_fully_compatible_mode": "나무마크 디자인 호환 모드",
     "added_menu": "추가 메뉴",
     "top_menu_setting": "추가 메뉴 설정",
+    "user_added_menu" : "사용자 추가 메뉴",
     "enter_top_menu_setting": "윗 줄에는 이름을 쓰고 아랫 줄에는 URL을 입력하세요.",
     "not_support_skin_warning": "이 기능을 미지원하는 스킨에서는 작동하지 않습니다.",
     "acl_thread_change": "스레드 ACL 변경",

+ 14 - 17
route/api_recent_change.py

@@ -5,28 +5,25 @@ def api_recent_change(num = 10):
         curs = conn.cursor()
 
         num = 50 if (1 if not num > 0 else num) > 50 else num
-        repeat_ok = flask.request.args.get('repeat', '1')
-        data_list = []
         admin = admin_check(6)
-        get_title = ''
+
+        data_list = []
 
         curs.execute(db_change('select id, title from rc where type = "" order by date desc limit ?'), [num])
         for for_a in curs.fetchall():
-            if repeat_ok == '1' or for_a[1] != get_title:
-                get_title = for_a[1]
-                curs.execute(db_change('select id, title, date, ip, send, leng, hide from history where id = ? and title = ?'), for_a)
-                get_data = curs.fetchall()
-                if get_data:
-                    get_data = list(get_data[0])
-                    if get_data[6] == '' or admin == 1:
-                        if admin == 1:
-                            data_list += get_data
-                        else:
-                            get_data[3] = ip_pas(get_data[3], 1)
-                            data_list += get_data
+            curs.execute(db_change('select id, title, date, ip, send, leng, hide from history where id = ? and title = ?'), for_a)
+            db_data = curs.fetchall()
+            if db_data:
+                db_data = list(db_data[0])
+                if db_data[6] == '' or admin == 1:
+                    if admin == 1:
+                        data_list += [db_data]
                     else:
-                        data_list += [['', '', '', '', '', '', get_data[6]]]
+                        db_data[3] = ip_pas(db_data[3], 1)
+                        data_list += [db_data]
                 else:
-                    data_list += [['', '', '', '', '', '', '']]
+                    data_list += [['', '', '', '', '', '', db_data[6]]]
+            else:
+                data_list += [['', '', '', '', '', '', '']]
 
         return flask.jsonify(data_list if data_list else {}) 

+ 2 - 2
route/api_recent_discuss.py

@@ -14,7 +14,7 @@ def api_recent_discuss(num = 10, get_type = 'normal'):
         else:
             curs.execute(db_change("select title, sub, date, code, stop from rd where not stop = 'O' order by date desc limit ?"), [num])
 
-        for i in curs.fetchall():
-            data_list += [i]
+        for for_a in curs.fetchall():
+            data_list += [for_a]
 
         return flask.jsonify(data_list if data_list else {}) 

+ 1 - 1
route/user_setting.py

@@ -108,7 +108,7 @@ def user_setting():
                             <hr class="main_hr">
                             <span>''' + load_lang('password_instead_key') + ''' : ''' + ramdom_key + ''' <a href="/change/key">(''' + load_lang('key_change') + ''')</a> <a href="/change/key/delete">(''' + load_lang('key_delete') + ''')</a></span>
                             <h2>''' + load_lang('main') + '''</h2>
-                            <a href="/change/head">(''' + load_lang('user_head') + ''')</a> <a href="/change/top_menu">(''' + load_lang('user_top_menu') + ''')</a>
+                            <a href="/change/head">(''' + load_lang('user_head') + ''')</a> <a href="/change/top_menu">(''' + load_lang('user_added_menu') + ''')</a>
                             <hr class="main_hr">
                             <span>''' + load_lang('skin') + '''</span>
                             <hr class="main_hr">

+ 1 - 1
route/user_setting_top_menu.py

@@ -24,7 +24,7 @@ def user_setting_top_menu():
             db_data = db_data[0][0] if db_data else ''
             
             return easy_minify(flask.render_template(skin_check(),
-                imp = [load_lang('top_menu_setting'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
+                imp = [load_lang('user_added_menu'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
                 data = '''
                     <span>
                         EX)