surplus-dev 4 년 전
부모
커밋
9cc27d57b1
4개의 변경된 파일23개의 추가작업 그리고 9개의 파일을 삭제
  1. 1 2
      route/edit.py
  2. 6 4
      route/edit_revert.py
  3. 15 2
      route/tool/func.py
  4. 1 1
      version.json

+ 1 - 2
route/edit.py

@@ -200,7 +200,7 @@ def edit(name = 'Test', name_load = 0, section = 0):
                                 name="ver" 
                                 value="''' + doc_ver + '''">
                         <hr class="main_hr">
-                        ''' + captcha_get() + ip_warning() + cccb_text + '''
+                        ''' + captcha_get() + ip_warning() + cccb_text + b_text + '''
                         <button id="save"
                                 type="submit" 
                                 onclick="
@@ -215,7 +215,6 @@ def edit(name = 'Test', name_load = 0, section = 0):
                                     load_preview(\'''' + url_pas(name) + '''\');
                                 ">''' + load_lang('preview') + '''</button>
                     </form>
-                    ''' + b_text + '''
                     <hr class="main_hr">
                     <div id="see_preview"></div>
                     <script>

+ 6 - 4
route/edit_revert.py

@@ -65,17 +65,19 @@ def edit_revert(name):
             curs.execute(db_change("select title from history where title = ? and id = ?"), [name, str(num)])
             if not curs.fetchall():
                 return redirect('/w/' + url_pas(name))
+                
+            b_text = get_edit_text_bottom()
+            cccb_text = get_edit_text_bottom_check_box()
 
             return easy_minify(flask.render_template(skin_check(),
                 imp = [name, wiki_set(), wiki_custom(), wiki_css(['(' + load_lang('revert') + ')', 0])],
                 data =  '''
                         <form method="post">
                             <span>r''' + flask.request.args.get('num', '0') + '''</span>
-                            <hr class=\"main_hr\">
-                            ''' + ip_warning() + '''
+                            <hr class="main_hr">
                             <input placeholder="''' + load_lang('why') + '''" name="send" type="text">
-                            <hr class=\"main_hr\">
-                            ''' + captcha_get() + '''
+                            <hr class="main_hr">
+                            ''' + captcha_get() + ip_warning() + cccb_text + b_text + '''
                             <button type="submit">''' + load_lang('revert') + '''</button>
                         </form>
                         ''',

+ 15 - 2
route/tool/func.py

@@ -1659,9 +1659,20 @@ def ip_pas(raw_ip, type_data = 0):
         
 # Func-edit
 def get_edit_text_bottom():
+    curs = conn.cursor()
+    
+    b_text = ''
+    
     curs.execute(db_change('select data from other where name = "edit_bottom_text"'))
-    sql_d = curs.fetchall()
-    return ('<hr class="main_hr">' + sql_d[0][0]) if sql_d and sql_d[0][0] != '' else ''
+    db_data= curs.fetchall()
+    if db_data and db_data[0][0] != '':
+        b_text = '' + \
+            '<hr class="main_hr">' + \
+            db_data[0][0] + \
+            '<hr class="main_hr">' + \
+        ''
+
+    return b_text
 
 def get_edit_text_bottom_check_box():
     curs = conn.cursor()
@@ -1680,6 +1691,8 @@ def get_edit_text_bottom_check_box():
     return cccb_text
 
 def do_edit_send_check(data):
+    curs = conn.cursor()
+    
     curs.execute(db_change('select data from other where name = "edit_bottom_compulsion"'))
     db_data = curs.fetchall()
     if db_data and db_data[0][0] != '' and data == '':

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.5 (stable1) (beta1) (dev5)",
+        "r_ver" : "v3.4.5 (stable1) (beta1) (dev6)",
         "c_ver" : "3500106",
         "s_ver" : "3500110"
     }