Ver Fonte

fix bug & add func

2du há 4 anos atrás
pai
commit
d0714643cc
7 ficheiros alterados com 21 adições e 19 exclusões
  1. 5 8
      app.py
  2. 2 0
      lang/en-US.json
  3. 3 1
      lang/ko-KR.json
  4. 3 1
      route/give_acl.py
  5. 2 1
      route/recent_changes.py
  6. 5 7
      route/recent_record_reset.py
  7. 1 1
      version.json

+ 5 - 8
app.py

@@ -455,14 +455,12 @@ def recent_history_reset(name = 'Test'):
     return recent_history_reset_2(conn, name)
 
 @app.route('/history/add/<everything:name>', methods = ['POST', 'GET'])
-def recent_history_add(name = None):
+def recent_history_add(name = 'Test'):
     return recent_history_add_2(conn, name)
 
-'''
 @app.route('/record/reset/<name>', methods = ['POST', 'GET'])
-def recent_record_reset():
-    return recent_record_reset_2(conn)
-'''
+def recent_record_reset(name = 'Test'):
+    return recent_record_reset_2(conn, name)
 
 # Func-search
 @app.route('/search', methods=['POST'])
@@ -495,7 +493,7 @@ def edit_backlink_reset(name = 'Test'):
 def edit_delete(name = None):
     return edit_delete_2(conn, name)
 
-# 수정 필요
+# 개편 예정
 @app.route('/many_delete', methods = ['POST', 'GET'])
 def edit_delete_many():
     return edit_delete_many_2(conn)
@@ -596,8 +594,7 @@ def watch_list_name(tool = 'star_doc', name = 'Test'):
     return watch_list_name_2(conn, tool, name)
 
 # Func-login
-
-# 현 구조
+# 개편 예정
 @app.route('/login', methods = ['POST', 'GET'])
 def login():
     return login_2(conn)

+ 2 - 0
lang/en-US.json

@@ -211,6 +211,8 @@
         "2fa" : "2FA",
         "2fa_password" : "2FA password",
         "2fa_password_change" : "Change 2FA password",
+        "history_reset" : "Document history reset",
+        "record_reset" : "User edit log reset",
         "_comment_2.1_" : "Filter",
             "_comment_2.1.1_" : "List",
                 "interwiki_list" : "Interwiki(s) list",

+ 3 - 1
lang/ko-KR.json

@@ -401,5 +401,7 @@
     "edit_set" : "편집 관련 설정",
     "wiki_shutdown" : "위키 엔진 종료",
     "shutdown" : "종료",
-    "history_delete_warning" : "역사를 지울 경우 복구하기 어려우니 신중하게 결정하세요."
+    "history_delete_warning" : "역사를 지울 경우 복구하기 어려우니 신중하게 결정하세요.",
+    "history_reset" : "문서 역사 초기화",
+    "record_reset" : "사용자 편집 기록 초기화"
 }

+ 3 - 1
route/give_acl.py

@@ -69,7 +69,9 @@ def give_acl_2(conn, name):
                 [load_lang('view_acl'), 'view']
             ]
         else:
-            acl_get_list = [load_lang('document_acl'), 'decu']
+            acl_get_list = [
+                [load_lang('document_acl'), 'decu']
+            ]
             
         for i in acl_get_list:
             data += '' + \

+ 2 - 1
route/recent_changes.py

@@ -179,7 +179,8 @@ def recent_changes_2(conn, name, tool):
                 menu = [
                     ['other', load_lang('other')], 
                     ['user', load_lang('user')], 
-                    ['count/' + url_pas(name), load_lang('count')]
+                    ['count/' + url_pas(name), load_lang('count')],
+                    ['record/reset/' + url_pas(name), load_lang('record_reset')]
                 ]
                 div += next_fix('/record/' + url_pas(name) + '?num=', num, data_list)
         else:

+ 5 - 7
route/recent_record_reset.py

@@ -3,26 +3,24 @@ from .tool.func import *
 def recent_record_reset_2(conn, name):
     curs = conn.cursor()
 
-    num = str(int(number_check(flask.request.args.get('num', '1'))))
-
     if admin_check() != 1:
         return re_error('/error/3')
 
     if flask.request.method == 'POST':
-        admin_check(None, 'history delete r' + num)
+        admin_check(None, 'record reset ' + name)
 
-        curs.execute(db_change("delete from history where id = ? and title = ?"), [num, name])
+        curs.execute(db_change("delete from history where ip = ?"), [name])
         conn.commit()
 
-        return redirect('/history/' + url_pas(name))
+        return redirect('/record/' + url_pas(name))
     else:
         return easy_minify(flask.render_template(skin_check(),
-            imp = [name, wiki_set(), wiki_custom(), wiki_css(['(r' + num + ')', 0])],
+            imp = [name, wiki_set(), wiki_custom(), wiki_css(['(' + load_lang('record_reset') + ')', 0])],
             data = '''
                 <form method="post">
                     <span>''' + load_lang('history_delete_warning') + '''</span>
                     <hr class="main_hr">
-                    <button type="submit">''' + load_lang('history_delete') + '''</button>
+                    <button type="submit">''' + load_lang('record_reset') + '''</button>
                 </form>
             ''',
             menu = [['history/' + url_pas(name), load_lang('return')]]

+ 1 - 1
version.json

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