2du 4 лет назад
Родитель
Сommit
01c7cdc34d
5 измененных файлов с 14 добавлено и 14 удалено
  1. 2 2
      app.py
  2. 9 8
      route/edit_revert.py
  3. 2 2
      route/recent_history_tool.py
  4. 1 1
      version.json
  5. 0 1
      views/main_css/js/render/markdown.js

+ 2 - 2
app.py

@@ -472,7 +472,7 @@ app.route('/diff/<int(signed = True):num_a>/<int(signed = True):num_b>/<everythi
 
 app.route('/down/<everything:name>')(view_down)
 
-# everything 다음에 추가 붙은 경우에 대해서 재검토 필요
+# everything 다음에 추가 붙은 경우에 대해서 재검토 필요 (진행중)
 app.route('/w_rev/<int(signed = True):doc_rev>/<everything:name>')(view_read)
 app.route('/w_from/<everything:name>')(view_read)
 app.route('/w/<everything:name>')(view_read)
@@ -489,7 +489,7 @@ app.route('/delete/<everything:name>', methods = ['POST', 'GET'])(edit_delete)
 app.route('/delete_file/<everything:name>', methods = ['POST', 'GET'])(edit_delete_file)
 app.route('/delete_mutiple', methods = ['POST', 'GET'])(edit_delete_mutiple)
 
-app.route('/revert/<everything:name>', methods = ['POST', 'GET'])(edit_revert)
+app.route('/revert/<int:num>/<everything:name>', methods = ['POST', 'GET'])(edit_revert)
 
 app.route('/move/<everything:name>', methods = ['POST', 'GET'])(edit_move)
 

+ 9 - 8
route/edit_revert.py

@@ -1,11 +1,9 @@
 from .tool.func import *
 
-def edit_revert(name):
+def edit_revert(name, num):
     with get_db_connect() as conn:
         curs = conn.cursor()
 
-        num = int(number_check(flask.request.args.get('num', '1')))
-
         curs.execute(db_change("select title from history where title = ? and id = ? and hide = 'O'"), [name, str(num)])
         if curs.fetchall() and admin_check(6) != 1:
             return re_error('/error/3')
@@ -13,7 +11,7 @@ def edit_revert(name):
         if acl_check(name) == 1:
             return re_error('/ban')
         
-        curs.execute(db_change("select title from history where title = ? and id = ?"), [name, str(num)])
+        curs.execute(db_change("select data from history where title = ? and id = ?"), [name, str(num)])
         data = curs.fetchall()
         if not data:
             return redirect('/w/' + url_pas(name))
@@ -72,17 +70,20 @@ def edit_revert(name):
 
             return redirect('/w/' + url_pas(name))
         else:
+            if data:
+                preview = '<pre>' + data[0][0] + '</pre>'
+            else:
+                preview = ''
+            
             return easy_minify(flask.render_template(skin_check(),
-                imp = [name, wiki_set(), wiki_custom(), wiki_css(['(' + load_lang('revert') + ')', 0])],
+                imp = [name, wiki_set(), wiki_custom(), wiki_css(['(r' + str(num) + ') (' + load_lang('revert') + ')', 0])],
                 data =  '''
                         <form method="post">
-                            <span>r''' + flask.request.args.get('num', '0') + '''</span>
-                            <hr class="main_hr">
                             <input placeholder="''' + load_lang('why') + '''" name="send" type="text">
                             <hr class="main_hr">
                             ''' + captcha_get() + ip_warning() + get_edit_text_bottom_check_box() + get_edit_text_bottom() + '''
                             <button type="submit">''' + load_lang('revert') + '''</button>
                         </form>
-                        ''',
+                        ''' + preview,
                 menu = [['history/' + url_pas(name), load_lang('history')], ['recent_changes', load_lang('recent_change')]]
             ))

+ 2 - 2
route/recent_history_tool.py

@@ -11,9 +11,9 @@ def recent_history_tool_2(conn, name, rev):
             '<li><a href="/raw_rev/' + num + '/' + url_pas(name) + '">' + load_lang('raw') + '</a></li>' + \
     ''
 
-    data += '<li><a href="/revert/' + url_pas(name) + '?num=' + num + '">' + load_lang('revert') + ' | r' + num + '</a></li>'
+    data += '<li><a href="/revert/' + num + '/' + url_pas(name) + '">' + load_lang('revert') + ' | r' + num + '</a></li>'
     if rev - 1 > 0:
-        data += '<li><a href="/revert/' + url_pas(name) + '?num=' + str(rev - 1) + '">' + load_lang('revert') + ' | r' + str(rev - 1) + '</a></li>'
+        data += '<li><a href="/revert/' + str(rev - 1) + '/' + url_pas(name) + '">' + load_lang('revert') + ' | r' + str(rev - 1) + '</a></li>'
     
     if rev - 1 > 0:
         data += '<li><a href="/diff/' + str(rev - 1) + '/' + num + '/' + url_pas(name) + '">' + load_lang('compare') + '</a></li>'

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.5 (stable1) (beta2) (dev8)",
+        "r_ver" : "v3.4.5 (stable1) (beta2) (dev9)",
         "c_ver" : "3500106",
         "s_ver" : "3500110"
     }

+ 0 - 1
views/main_css/js/render/markdown.js

@@ -1,6 +1,5 @@
 "use strict";
 
-// 걍 언더바로 통일하자
 class opennamu_render_markdown {
     // Init Part
     constructor(