Răsfoiți Sursa

add send edit func

2du 4 ani în urmă
părinte
comite
959aeeec8e

+ 3 - 4
app.py

@@ -367,7 +367,8 @@ def list_title_index():
 def list_user_topic(name = 'test'):
     return list_user_topic_2(conn, name)
 
-@app.route('/<regex("long_page|short_page"):tool>')
+@app.route('/<regex("long_page"):tool>')
+@app.route('/<regex("short_page"):tool>')
 def list_long_page(tool = 'long_page'):
     return list_long_page_2(conn, tool)
 
@@ -453,11 +454,9 @@ def recent_history_delete(name = 'Test', rev = 1):
 def recent_history_hidden(name = 'Test', rev = 1):
     return recent_history_hidden_2(conn, name, rev)
 
-'''
-@app.route('/history/send/<int(signed=True):rev>/<everything:name>')
+@app.route('/history/send/<int(signed=True):rev>/<everything:name>', methods = ['POST', 'GET'])
 def recent_history_send(name = 'Test', rev = 1):
     return recent_history_send_2(conn, name, rev)
-'''
 
 @app.route('/history/reset/<everything:name>', methods = ['POST', 'GET'])
 def recent_history_reset(name = 'Test'):

+ 1 - 1
route/main_other.py

@@ -28,7 +28,7 @@ def main_other_2(conn):
                 <li><a href="/image_file_list">''' + load_lang('image_file_list') + '''</a></li>
                 <li><a href="/vote">''' + load_lang('vote_list') + '''</a></li>
                 <li><a href="/long_page">''' + load_lang('long_page') + '''</a></li>
-                <!-- <li><a href="/short_page">''' + load_lang('short_page') + '''</a></li> -->
+                <li><a href="/short_page">''' + load_lang('short_page') + '''</a></li>
             </ul>
             <br>
             <h2>''' + load_lang('other') + '''</h2>

+ 2 - 2
route/recent_history_delete.py

@@ -17,12 +17,12 @@ def recent_history_delete_2(conn, name, rev):
         return redirect('/history/' + 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('history_delete') + ') (r' + num + ')', 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('delete') + '''</button>
                 </form>
             ''',
             menu = [['history/' + url_pas(name), load_lang('return')]]

+ 1 - 1
route/recent_history_reset.py

@@ -20,7 +20,7 @@ def recent_history_reset_2(conn, name):
                 <form method="post">
                     <span>''' + load_lang('history_delete_warning') + '''</span>
                     <hr class="main_hr">
-                    <button type="submit">''' + load_lang('history_reset') + '''</button>
+                    <button type="submit">''' + load_lang('reset') + '''</button>
                 </form>
             ''',
             menu = [['history/' + url_pas(name), load_lang('return')]]

+ 33 - 15
route/recent_history_send.py

@@ -1,27 +1,45 @@
 from .tool.func import *
 
-def recent_record_send_2(conn, name):
+def recent_history_send_2(conn, name, rev):
     curs = conn.cursor()
 
+    num = str(rev)
+    
     if admin_check() != 1:
         return re_error('/error/3')
 
     if flask.request.method == 'POST':
-        admin_check(None, 'record reset ' + name)
+        admin_check(None, 'send edit ' + name + ' r' + num)
+
+        curs.execute(db_change("select send from history where title = ? and id = ?"), [name, num])
+        if curs.fetchall():
+            curs.execute(db_change("update history set send = ? where title = ? and id = ?"), [
+                flask.request.form.get('send', ''),
+                name, 
+                num
+            ])
 
-        curs.execute(db_change("delete from history where ip = ?"), [name])
         conn.commit()
 
-        return redirect('/record/' + url_pas(name))
+        return redirect('/history/' + url_pas(name))
     else:
-        return easy_minify(flask.render_template(skin_check(),
-            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('record_reset') + '''</button>
-                </form>
-            ''',
-            menu = [['history/' + url_pas(name), load_lang('return')]]
-        ))
+        curs.execute(db_change("select send from history where title = ? and id = ?"), [name, num])
+        send = curs.fetchall()
+        if send:
+            send = send[0][0]
+        
+            return easy_minify(flask.render_template(skin_check(),
+                imp = [name, wiki_set(), wiki_custom(), wiki_css(['(' + load_lang('send_edit') + ') (r' + num + ')', 0])],
+                data = '''
+                    <form method="post">
+                        <span>''' + load_lang('history_delete_warning') + '''</span>
+                        <hr class="main_hr">
+                        <input value="''' + html.escape(send) + '''" name="send">
+                        <hr class="main_hr">
+                        <button type="submit">''' + load_lang('edit') + '''</button>
+                    </form>
+                ''',
+                menu = [['history/' + url_pas(name), load_lang('return')]]
+            ))
+        else:
+            return redirect('/history/' + url_pas(name))

+ 2 - 2
route/recent_history_tool.py

@@ -23,7 +23,7 @@ def recent_history_tool_2(conn, name, rev):
     
     if admin_check(6) == 1:
         data += '<h3>admin</h3>'
-        data += '<ul>'
+        data += '<ul class="inside_ul">'
         curs.execute(db_change('' + \
             'select title from history ' + \
             'where title = ? and id = ? and hide = "O"' + \
@@ -39,7 +39,7 @@ def recent_history_tool_2(conn, name, rev):
 
     if admin_check() == 1:
         data += '<h3>owner</h3>'
-        data += '<ul>'
+        data += '<ul class="inside_ul">'
         data += '<li><a href="/history/delete/' + num + '/' + url_pas(name) + '">' + load_lang('history_delete') + '</li>'
         data += '<li><a href="/history/send/' + num + '/' + url_pas(name) + '">' + load_lang('send_edit') + '</li>'
         data += '</ul>'

+ 2 - 2
route/recent_record_reset.py

@@ -20,8 +20,8 @@ def recent_record_reset_2(conn, name):
                 <form method="post">
                     <span>''' + load_lang('history_delete_warning') + '''</span>
                     <hr class="main_hr">
-                    <button type="submit">''' + load_lang('record_reset') + '''</button>
+                    <button type="submit">''' + load_lang('reset') + '''</button>
                 </form>
             ''',
-            menu = [['history/' + url_pas(name), load_lang('return')]]
+            menu = [['record/' + 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.17-01)",
+        "r_ver" : "v3.4.0-stable-01b (beta-01b) (dev-21.08.21-01)",
         "c_ver" : "3400101",
         "s_ver" : "12"
     }