Kaynağa Gözat

최근 변경에 편집 요청 추가

https://github.com/openNAMU/openNAMU/issues/2064
잉여개발기 (SPDV) 2 yıl önce
ebeveyn
işleme
f2625db160
3 değiştirilmiş dosya ile 7 ekleme ve 11 silme
  1. 1 6
      route/edit.py
  2. 4 4
      route/edit_request.py
  3. 2 1
      route/recent_change.py

+ 1 - 6
route/edit.py

@@ -107,8 +107,6 @@ def edit(name = 'Test', section = 0, do_type = ''):
         edit_req_mode = 0
         if acl_check(name, 'document_edit') == 1:
             edit_req_mode = 1
-            if acl_check(name, 'document_edit_request') == 1:
-                return redirect('/raw_acl/' + url_pas(name))
             
         if do_title_length_check(name) == 1:
             return re_error('/error/38')
@@ -119,10 +117,7 @@ def edit(name = 'Test', section = 0, do_type = ''):
 
         curs.execute(db_change("select set_data from data_set where doc_name = ? and doc_rev = ? and set_name = 'edit_request_data'"), [name, doc_ver])
         if curs.fetchall():
-            if edit_req_mode == 0:
-                return redirect('/edit_request_from/' + url_pas(name))
-            else:
-                return redirect('/raw_acl/' + url_pas(name))
+            return redirect('/edit_request_from/' + url_pas(name))
         
         section = '' if section == 0 else section
         post_ver = flask.request.form.get('ver', '')

+ 4 - 4
route/edit_request.py

@@ -6,9 +6,9 @@ def edit_request(name = 'Test', do_type = ''):
     with get_db_connect() as conn:
         curs = conn.cursor()
 
-        disable = ""
+        disabled = ""
         if acl_check(name, 'document_edit') == 1:
-            disabled = "disable"
+            disabled = "disabled"
 
         curs.execute(db_change("select id from history where title = ? order by id + 0 desc"), [name])
         doc_ver = curs.fetchall()
@@ -102,8 +102,8 @@ def edit_request(name = 'Test', do_type = ''):
                     ''' + result + '''
                     <hr class="main_hr">
                     <form method="post">
-                        <button id="opennamu_save_button" type="submit" name="check" value="Y">''' + load_lang('approve') + '''</button>
-                        <button id="opennamu_preview_button" type="submit" name="check" value="">''' + load_lang('decline') + '''</button>
+                        <button ''' + disabled + ''' id="opennamu_save_button" type="submit" name="check" value="Y">''' + load_lang('approve') + '''</button>
+                        <button ''' + disabled + ''' id="opennamu_preview_button" type="submit" name="check" value="">''' + load_lang('decline') + '''</button>
                         <hr class="main_hr">
                         <textarea readonly class="opennamu_textarea_500">''' + html.escape(edit_request_data) + '''</textarea>
                     </form>

+ 2 - 1
route/recent_change.py

@@ -37,7 +37,8 @@ def recent_change(name = '', tool = '', num = 1, set_type = 'normal'):
             ['move', load_lang('move')],
             ['delete', load_lang('delete')],
             ['revert', load_lang('revert')],
-            ['r1', load_lang('new_doc')]
+            ['r1', load_lang('new_doc')],
+            ['edit_request', load_lang('edit_request')]
         ]
 
         if flask.request.method == 'POST':