Surplus_Up (2DU) 6 лет назад
Родитель
Сommit
95b173283f
4 измененных файлов с 11 добавлено и 8 удалено
  1. 1 1
      route/tool/func.py
  2. 4 1
      route/view_raw.py
  3. 2 2
      route/view_read.py
  4. 4 4
      version.json

+ 1 - 1
route/tool/func.py

@@ -201,7 +201,7 @@ def update(ver_num):
         print('Add init set')
         set_init()
 
-    if ver_num < 3160400:
+    if ver_num < 3160500:
         curs.execute(db_change('delete from cache_data'))
 
     conn.commit()

+ 4 - 1
route/view_raw.py

@@ -39,7 +39,10 @@ def view_raw_2(conn, name, topic_num, num):
         v_name = load_lang('discussion_raw')
         sub = ' (#' + str(num) + ')'
 
-        menu = [['topic/' + url_pas(name) + '/sub/' + url_pas(sub_title) + '#' + str(num), load_lang('discussion')], ['topic/' + url_pas(name) + '/sub/' + url_pas(sub_title) + '/admin/' + str(num), load_lang('return')]]
+        menu = [
+            ['topic/' + url_pas(name) + '/sub/' + url_pas(sub_title) + '#' + str(num), load_lang('discussion')], 
+            ['topic/' + url_pas(name) + '/sub/' + url_pas(sub_title) + '/admin/' + str(num), load_lang('return')]
+        ]
     else:
         curs.execute(db_change("select data from data where title = ?"), [name])
 

+ 2 - 2
route/view_read.py

@@ -85,7 +85,7 @@ def view_read_2(conn, name):
         else:
             curs.execute(db_change("select data from data where title = ?"), [name])
 
-    if cache_data:
+    if cache_data and acl_check(name, 'render') != 1:
         end_data = cache_data[0][0]
     else:
         data = curs.fetchall()
@@ -108,7 +108,7 @@ def view_read_2(conn, name):
             data = else_data
         )
 
-        if not num:
+        if not num and acl_check(name, 'render') != 1:
             curs.execute(db_change("delete from cache_data where title = ?"), [name])
             if last_history_num:
                 curs.execute(db_change("insert into cache_data (title, data, id) values (?, ?, ?)"), [name, end_data, last_history_num[0][0]])

+ 4 - 4
version.json

@@ -1,11 +1,11 @@
 {
     "master" : {
-        "r_ver" : "v3.1.7-master-02",
-        "c_ver" : "3160400",
+        "r_ver" : "v3.1.6-stable-05",
+        "c_ver" : "3160500",
         "s_ver" : "7"
     }, "stable" : {
-        "r_ver" : "v3.1.6-stable-04",
-        "c_ver" : "3160400",
+        "r_ver" : "v3.1.6-stable-05",
+        "c_ver" : "3160500",
         "s_ver" : "7"
     }
 }