ACL 문서 목록 개편

route/list_acl.py

@@ -5,35 +5,27 @@ def list_acl_2(conn):
 
     div = '<ul>'
 
-    curs.execute(db_change("select title, decu, dis, view, why from acl where decu != '' or dis != '' or view != '' order by title desc"))
+    curs.execute(db_change("select title, why from acl where decu != '' or dis != '' or view != '' order by title desc"))
     list_data = curs.fetchall()
     for data in list_data:
         if not re.search('^user:', data[0]) and not re.search('^file:', data[0]):
-            acl = []
-            for i in range(1, 4):
-                if data[i] == 'admin':
-                    acl += [load_lang('admin')]
-                elif data[i] == 'user':
-                    acl += [load_lang('member')]
-                elif data[i] == '':
-                    acl += [load_lang('normal')]
-                else:
-                    acl += [data[i]]
-
             curs.execute(db_change("select time from re_admin where what like ? order by time desc limit 1"), ['acl (' + data[0] + ')%'])
             time_data = curs.fetchall()
             if time_data:
-                time_data = ' | ' + time_data[0][0]
+                time_data = time_data[0][0] + ' | '
             else:
                 time_data = ''
+                
+            if data[1] != '':
+                why = ' | ' + data[1]
+            else:
+                why = ''
 
             div += '' + \
                 '<li>' + \
-                    '<a href="/w/' + url_pas(data[0]) + '">' + data[0] + '</a> | ' + \
-                    load_lang('document_acl') + ' : ' + acl[0] + ' | ' + \
-                    load_lang('discussion_acl') + ' : ' + acl[1] + ' | ' + \
-                    load_lang('view_acl') + ' : ' + acl[2] + \
                     time_data + \
+                    '<a href="/acl/' + url_pas(data[0]) + '">' + data[0] + '</a>' + \
+                     why + \
                 '</li>' + \
             ''
 

route/list_not_close_topic.py

@@ -8,7 +8,7 @@ def list_not_close_topic_2(conn):
     curs.execute(db_change('select title, sub, date, code from rd where stop != "O" order by date desc'))
     n_list = curs.fetchall()
     for data in n_list:
-        div += '<li>' + data[2] + ' : <a href="/thread/' + data[3] + '">' + html.escape(data[1]) + '</a> (' + html.escape(data[0]) + ')</li>'
+        div += '<li>' + data[2] + ' | <a href="/thread/' + data[3] + '">' + html.escape(data[1]) + '</a> (' + html.escape(data[0]) + ')</li>'
 
     div += '</ul>'
 

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.7-master-26",
+        "r_ver" : "v3.1.7-master-27",
         "c_ver" : "3171800",
         "s_ver" : "7"
     }, "stable" : {