잉여개발기 (SPDV) hace 2 años
padre
commit
faf27cee0c
Se han modificado 4 ficheros con 7 adiciones y 5 borrados
  1. 1 1
      app.py
  2. 4 2
      route/list_admin_auth_use.py
  3. 1 1
      route/view_acl.py
  4. 1 1
      version.json

+ 1 - 1
app.py

@@ -341,7 +341,7 @@ app.route('/list/file/<int:arg_num>')(list_image_file)
 app.route('/list/admin')(list_admin)
 
 app.route('/list/admin/auth_use', methods = ['POST', 'GET'])(list_admin_auth_use)
-app.route('/list/admin/auth_use/<arg_search>/<int:arg_num>', methods = ['POST', 'GET'])(list_admin_auth_use)
+app.route('/list/admin/auth_use_page/<int:arg_num>/<everything:arg_search>', methods = ['POST', 'GET'])(list_admin_auth_use)
 
 app.route('/list/user')(list_user)
 app.route('/list/user/<int:arg_num>')(list_user)

+ 4 - 2
route/list_admin_auth_use.py

@@ -7,8 +7,10 @@ def list_admin_auth_use(arg_num = 1, arg_search = 'normal'):
         sql_num = (arg_num * 50 - 50) if arg_num * 50 > 0 else 0
 
         if flask.request.method == 'POST':
-            return redirect('/list/admin/auth_use/' + url_pas(flask.request.form.get('search', 'normal')) + '/1')
+            return redirect('/list/admin/auth_use_page/1/' + url_pas(flask.request.form.get('search', 'normal')))
         else:
+            arg_search = 'normal' if arg_search == '' else arg_search
+            
             if arg_search == 'normal':
                 curs.execute(db_change("select who, what, time from re_admin order by time desc limit ?, 50"), [sql_num])
             else:
@@ -30,7 +32,7 @@ def list_admin_auth_use(arg_num = 1, arg_search = 'normal'):
                 list_data += '<li>' + ip_pas(data[0]) + ' | ' + html.escape(do_data) + ' | ' + data[2] + '</li>'
 
             list_data += '</ul>'
-            list_data += next_fix('/list/admin/auth_use/' + url_pas(arg_search) + '/', arg_num, get_list)
+            list_data += get_next_page_bottom('/list/admin/auth_use_page/{}/' + url_pas(arg_search), arg_num, get_list)
 
             arg_search = html.escape(arg_search) if arg_search != 'normal' else ''
 

+ 1 - 1
route/view_acl.py

@@ -185,6 +185,6 @@ def view_acl(name):
                 menu = [
                     ['w/' + url_pas(name), load_lang('return')], 
                     ['manager', load_lang('admin')], 
-                    ['list/admin/auth_use/' + url_pas('acl (' + name + ')') + '/1', load_lang('acl_record')]
+                    ['list/admin/auth_use_page/1/' + url_pas('acl (' + name + ')'), load_lang('acl_record')]
                 ]
             ))

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC5-dev43",
+        "r_ver" : "v3.4.6-RC5-dev44",
         "c_ver" : "3500373",
         "s_ver" : "3500112"
     }