Merge pull request #866 from gnote8-0/master

버그 수정, 문구 수정

app.py

@@ -374,6 +374,10 @@ def list_acl():
 def give_admin_groups(name = None):
     return give_admin_groups_2(conn, name)
 
+@app.route('/delete_admin_group/<name>', methods=['POST', 'GET'])
+def delete_admin_group(name = None):
+    return delete_admin_group_2(conn, name)
+
 @app.route('/admin_list')
 def list_admin():
     return list_admin_2(conn)
@@ -724,4 +728,4 @@ if __name__ == "__main__":
         else:
             print('----')
             print(e)
-            raise
+            raise

language/en-US.json

@@ -97,6 +97,7 @@
         "view" : "View",
         "content" : "Content",
         "off" : "Off",
+        "delete_admin_group": "Delete admin group",
         "_comment_1.1_" : "Time",
             "second" : "Second(s)",
             "hour" : "Hour(s)",
@@ -181,9 +182,10 @@
         "topic_setting" : "Discussion settings",
         "old_page" : "Old decument(s)",
         "skin_set" : "Skin setting(s)",
-        "many_delete" : "Bulk delete",
+        "many_delete" : "Document bulk delete",
         "edit_req" : "Edit request",
         "edit_req_check" : "Check edit request",
+        "accept_edit_request" : "Accept edit request",
         "history_add" : "Add history",
         "all_register_num" : "The number of application forms",
         "replace_move" : "Reversing documents",

language/ko-KR.json

@@ -1,4 +1,5 @@
 {
+    "delete_admin_group": "관리자 그룹 삭제",
     "document_name": "문서명",
     "non_login_alert": "비로그인 알림",
     "hide": "숨김",
@@ -305,7 +306,7 @@
     "skin_set": "스킨 설정",
     "edit_help": "편집 창 문구",
     "defalut_edit_help": "이곳에 내용을 입력해주세요.",
-    "many_delete": "대량 삭제",
+    "many_delete": "문서 대량 삭제",
     "many_delete_help": "한 줄에 문서명을 한 개씩 적어주세요.",
     "content": "내용",
     "upload_acl": "파일 업로드 ACL",
@@ -341,5 +342,6 @@
     "add_watchlist" : "주시 문서 추가",
     "blocked_user" : "차단된 사용자",
     "blocked_admin" : "차단한 관리자",
-    "invalid_password_error" : "비밀번호 또는 아이디가 없습니다."
+    "invalid_password_error" : "비밀번호 또는 아이디가 없습니다.",
+    "accept_edit_request": "편집 요청 승인"
 }

route/edit_req.py

@@ -124,7 +124,7 @@ def edit_req_2(conn, name):
         data_old = data
         get_name = ''
 
-        save_button = load_lang('edit_req') if not get_ver else load_lang('edit_req_check')
+        save_button = load_lang('edit_req') if not get_ver else load_lang('accept_edit_request')
         menu_plus = [[]]
         sub = load_lang('edit_req')
         disable = '' if not get_ver else 'disabled'
@@ -163,4 +163,4 @@ def edit_req_2(conn, name):
                 <div id="see_preview"></div>
             ''',
             menu = [['w/' + url_pas(name), load_lang('return')]] + menu_plus
-        ))
+        ))

route/give_delete_admin_group.py

@@ -0,0 +1,20 @@
+from .tool.func import *
+
+def delete_admin_group_2(conn, name):
+    if admin_check(None) != 1:
+        return re_error('/error/3')
+    
+    if flask.request.method == 'POST':
+        curs.execute(db_change("delete from alist where name = ?"), [name])
+
+        return redirect('/give_log')
+    
+    return easy_minify(flask.render_template(skin_check(),
+        imp = [load_lang("delete_admin_group"), wiki_set(), custom(), other2(['(' + name + ')', 0])],
+        data = '''
+            <form method=post>
+                <button type=submit>''' + load_lang('start') + '''</button>
+            </form>
+        ''',
+        menu = [['give_log', load_lang('return')]]
+    ))  

route/give_user_check.py

@@ -65,7 +65,7 @@ def give_user_check_2(conn, name):
     record = curs.fetchall()
     if record:
         if not flask.request.args.get('plus', None):
-            div = '<a href="/manager/14?plus=' + url_pas(name) + '">(' + load_lang('compare') + ')</a><hr class=\"main_hr\">' + div
+            div = '<a href="/manager/14?plus=' + url_pas(name) + '">(' + load_lang('compare') + ')</a><hr class=\"main_hr\">'
         else:
             div = '<a href="/check/' + url_pas(name) + '">(' + name + ')</a> <a href="/check/' + url_pas(flask.request.args.get('plus', None)) + '">(' + flask.request.args.get('plus', None) + ')</a><hr class=\"main_hr\">' + div
 
@@ -112,4 +112,4 @@ def give_user_check_2(conn, name):
         imp = [load_lang('check'), wiki_set(), custom(), other2([0, 0])],
         data = div,
         menu = [['manager', load_lang('return')]]
-    ))
+    ))

route/list_give.py

@@ -10,8 +10,13 @@ def list_give_2(conn):
     for data in curs.fetchall():
         if back != data[0]:
             back = data[0]
+            
+        if admin_check(None) == 1:
+            delGroupLnk = ' <a href="/delete_admin_group/' + url_pas(data[0]) + '">[' + load_lang("delete") + ']</a>'
+        else:
+            delGroupLnk = ""
 
-        list_data += '<li><a href="/admin_plus/' + url_pas(data[0]) + '">' + data[0] + '</a></li>'
+        list_data += '<li><a href="/admin_plus/' + url_pas(data[0]) + '">' + data[0] + '</a>' + delGroupLnk + '</li>'
 
     list_data += '</ul><hr class=\"main_hr\"><a href="/manager/8">(' + load_lang('add') + ')</a>'
 
@@ -19,4 +24,4 @@ def list_give_2(conn):
         imp = [load_lang('admin_group_list'), wiki_set(), custom(), other2([0, 0])],
         data = list_data,
         menu = [['manager', load_lang('return')]]
-    ))    
+    ))    

route/recent_discuss.py

@@ -40,7 +40,7 @@ def recent_discuss_2(conn):
         title = html.escape(data[0])
         sub = html.escape(data[1])
 
-        div += '<tr><td><a href="/thread/' + get_code + '">' + title + '</a> (' + sub + ')</td><td>' + data[2] + '</td></tr>'
+        div += '<tr><td><a href="/thread/' + get_code + '">' + sub + '</a> (' + title + ')</td><td>' + data[2] + '</td></tr>'
 
     div += '</tbody></table>'
 
@@ -48,4 +48,4 @@ def recent_discuss_2(conn):
         imp = [load_lang('recent_discussion'), wiki_set(), custom(), other2([m_sub, 0])],
         data = div,
         menu = 0
-    ))
+    ))