ソースを参照

버그 수정

Surplus_Up (2DU) 6 年 前
コミット
afc421745d
5 ファイル変更22 行追加16 行削除
  1. 1 1
      route/api_topic_sub.py
  2. 14 12
      route/tool/func.py
  3. 1 1
      version.json
  4. 4 0
      views/marisa/css/main.css
  5. 2 2
      views/marisa/index.html

+ 1 - 1
route/api_topic_sub.py

@@ -104,7 +104,7 @@ def api_topic_sub_2(conn, topic_num):
                 json_data[i[0]] = {
                     "data" : t_data_f,
                     "date" : i[2],
-                    "ip" : i[3],
+                    "ip" : ip_pas(i[3], 1),
                     "block" : i[4],
                 }
 

+ 14 - 12
route/tool/func.py

@@ -598,7 +598,7 @@ def admin_check(num = None, what = None, name = ''):
 
     return 0
 
-def ip_pas(raw_ip):
+def ip_pas(raw_ip, type_d = 0):
     hide = 0
 
     if ip_or_user(raw_ip) != 0:
@@ -612,20 +612,22 @@ def ip_pas(raw_ip):
         else:
             ip = raw_ip
     else:
-        curs.execute(db_change("select title from data where title = ?"), ['user:' + raw_ip])
-        if curs.fetchall():
-            ip = '<a href="/w/' + url_pas('user:' + raw_ip) + '">' + raw_ip + '</a>'
-        else:
-            ip = '<a id="not_thing" href="/w/' + url_pas('user:' + raw_ip) + '">' + raw_ip + '</a>'
+        if type_d == 0:
+            curs.execute(db_change("select title from data where title = ?"), ['user:' + raw_ip])
+            if curs.fetchall():
+                ip = '<a href="/w/' + url_pas('user:' + raw_ip) + '">' + raw_ip + '</a>'
+            else:
+                ip = '<a id="not_thing" href="/w/' + url_pas('user:' + raw_ip) + '">' + raw_ip + '</a>'
 
-        if admin_check('all', None, raw_ip) == 1:
-            ip = '<b>' + ip + '</b>'
+            if admin_check('all', None, raw_ip) == 1:
+                ip = '<b>' + ip + '</b>'
 
-    if ban_check(raw_ip) == 1:
-        ip = '<s>' + ip + '</s>'
+    if type_d == 0:
+        if ban_check(raw_ip) == 1:
+            ip = '<s>' + ip + '</s>'
 
-    if hide == 0:
-        ip += ' <a href="/tool/' + url_pas(raw_ip) + '">(' + load_lang('tool') + ')</a>'
+        if hide == 0:
+            ip += ' <a href="/tool/' + url_pas(raw_ip) + '">(' + load_lang('tool') + ')</a>'
 
     return ip
 

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.5-master-42",
+        "r_ver" : "v3.1.5-master-43",
         "c_ver" : "400007",
         "s_ver" : "7"
     }, "stable" : {

+ 4 - 0
views/marisa/css/main.css

@@ -423,4 +423,8 @@ div#last_edit {
     #search_input {
         width: calc(100% - 60px);
     }
+}
+
+#titlt_a {
+    color: initial;
 }

+ 2 - 2
views/marisa/index.html

@@ -8,7 +8,7 @@
             <title>{{imp[0]}} - {{imp[1][0]}}</title>
         {% endif %}
         {{imp[3][3]|safe}}
-        <link rel="stylesheet" href="/views/marisa/css/main.css?ver=6">
+        <link rel="stylesheet" href="/views/marisa/css/main.css?ver=7">
         <script src="/views/marisa/js/search.js?ver=2"></script>
         <script src="/views/marisa/js/skin_set.js?ver=3"></script>
         <script src="/views/marisa/js/main.js?ver=3"></script>
@@ -135,7 +135,7 @@
                         </div>
                     {% endif %}
                     <h1 id="title">
-                        <span class="change_space">{{imp[0]}}</span>
+                        <a id="titlt_a" href="#"><span class="change_space">{{imp[0]}}</span></a>
                         {% if imp[3][0] != 0 %}
                             <sub>{{imp[3][0]}}</sub>
                         {% endif %}