Просмотр исходного кода

https://github.com/openNAMU/openNAMU/pull/1679

잉여개발기 (SPDV) 3 лет назад
Родитель
Сommit
135691d360
3 измененных файлов с 5 добавлено и 5 удалено
  1. 3 3
      route/give_user_check.py
  2. 1 1
      route/view_xref.py
  3. 1 1
      version.json

+ 3 - 3
route/give_user_check.py

@@ -48,7 +48,7 @@ def give_user_check_2(name):
                 if num == 1:
                     curs.execute(db_change("" + \
                         "select distinct ip from ua_d " + \
-                        "where " + ('ip' if ip_or_user(name) == 1 else 'name') + " = ? or " + ('ip' if ip_or_user(plus_id) == 1 else 'name') + " = ? "
+                        "where " + ('ip' if ip_or_user(name) == 1 else 'name') + " = ? or " + ('ip' if ip_or_user(plus_id) == 1 else 'name') + " = ?"
                     ""), [name, plus_id])
                     all_ip_count = len(curs.fetchall())
 
@@ -60,7 +60,7 @@ def give_user_check_2(name):
 
                     curs.execute(db_change("" + \
                         "select distinct ip from ua_d " + \
-                        "where " + ('ip' if ip_or_user(plus_id) == 1 else 'name') + " = ? "
+                        "where " + ('ip' if ip_or_user(plus_id) == 1 else 'name') + " = ?"
                     ""), [plus_id])
                     b_ip_count = len(curs.fetchall())
 
@@ -154,7 +154,7 @@ def give_user_check_2(name):
             ))
         else:
             curs.execute(db_change("" + \
-                "select distinct " + ('name' if ip_or_user(name) == 1 else 'ip') + " from ua_d " + \
+                "select distinct " + ('name' if ip_or_user(name) == 1 else 'ip') + ", today from ua_d " + \
                 "where " + ('ip' if ip_or_user(name) == 1 else 'name') + " = ? "
                 "order by today desc limit ?, 50" + \
             ""), [name, sql_num])

+ 1 - 1
route/view_xref.py

@@ -25,7 +25,7 @@ def view_xref(name = 'Test', xref_type = 1):
         curs.execute(db_change("" + \
             "select distinct " + sql_insert[0] + ", type from back " + \
             "where " + sql_insert[1] + " = ? and not type = 'no' and not type = 'nothing'" + \
-            "order by type asc, title asc limit ?, 50" + \
+            "order by type asc, " + sql_insert[0] + " asc limit ?, 50" + \
         ""), [
             name,
             sql_num

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC2-dev130",
+        "r_ver" : "v3.4.6-RC2-dev131",
         "c_ver" : "3500358",
         "s_ver" : "3500111"
     }