Surplus_Up (2DU) 7 лет назад
Родитель
Сommit
bc00dbd5aa
2 измененных файлов с 7 добавлено и 4 удалено
  1. 1 1
      route/topic_admin.py
  2. 6 3
      route/view_raw.py

+ 1 - 1
route/topic_admin.py

@@ -71,7 +71,7 @@ def topic_admin_2(conn, name, sub, num):
     ban = '<h2>' + load_lang('state') + '</h2><ul>' + ban
 
     return easy_minify(flask.render_template(skin_check(), 
-        imp = [load_lang('discussion_tool'), wiki_set(), custom(), other2([' (' + str(num) + ')', 0])],
+        imp = [load_lang('discussion_tool'), wiki_set(), custom(), other2([' (#' + str(num) + ')', 0])],
         data = ban,
         menu = [['topic/' + url_pas(name) + '/sub/' + url_pas(sub) + '#' + str(num), load_lang('return')]]
     ))

+ 6 - 3
route/view_raw.py

@@ -22,10 +22,13 @@ def view_raw_2(conn, name, sub_title, num):
 
         menu = [['history/' + url_pas(name), load_lang('history')]]
     elif sub_title:
-        curs.execute("select data from topic where id = ? and title = ? and sub = ? and block = ''", [str(num), name, sub_title])
+        if admin_check(6) != 1:
+            curs.execute("select data from topic where id = ? and title = ? and sub = ? and block = ''", [str(num), name, sub_title])
+        else:
+            curs.execute("select data from topic where id = ? and title = ? and sub = ?", [str(num), name, sub_title])
         
         v_name = load_lang('discussion_raw')
-        sub = ' (' + str(num) + ')'
+        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')]]
     else:
@@ -44,4 +47,4 @@ def view_raw_2(conn, name, sub_title, num):
             menu = menu
         ))
     else:
-        return redirect('/w/' + url_pas(name))
+        return re_error('/error/3')