Selaa lähdekoodia

사용자 정보 표 수정

https://github.com/openNAMU/openNAMU/issues/2346
잉여개발기 1 vuosi sitten
vanhempi
sitoutus
020da823f7
5 muutettua tiedostoa jossa 24 lisäystä ja 27 poistoa
  1. 1 0
      lang/en-US.json
  2. 2 1
      lang/ko-KR.json
  3. 1 1
      route/tool/func.py
  4. 1 1
      version.json
  5. 19 24
      views/main_css/js/func/insert_user_info.js

+ 1 - 0
lang/en-US.json

@@ -44,6 +44,7 @@
     "url" : "URL",
     "resolution" : "Resolution",
     "file_delete_with_document" : "Delete document and file at the same time",
+    "method" : "Method",
 
     "_comment_" : "Common",
     "data" : "Data",

+ 2 - 1
lang/ko-KR.json

@@ -690,5 +690,6 @@
     "multiple_move" : "다중 문서 이동",
     "file_delete_with_document" : "문서와 파일 동시 삭제",
     "url" : "URL",
-    "resolution" : "해상도"
+    "resolution" : "해상도",
+    "method" : "방법"
 }

+ 1 - 1
route/tool/func.py

@@ -1235,7 +1235,7 @@ def skin_check(conn, set_n = 0):
         return skin
     
 def cache_v():
-    return '.cache_v272'
+    return '.cache_v273'
 
 def wiki_css(data):
     with class_temp_db() as m_conn:

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-v175",
+        "r_ver" : "v3.5.0-v176",
         "c_ver" : "20240513",
         "s_ver" : "20240426"
     }

+ 19 - 24
views/main_css/js/func/insert_user_info.js

@@ -12,36 +12,31 @@ function do_insert_user_info() {
             let get_data_auth = data['data']['auth'];
             let get_data_auth_date = data['data']['auth_date'];
             if(get_data_auth_date !== '0') {
-                get_data_auth += ' (~' + get_data_auth_date + ')'
+                get_data_auth += ' (~' + get_data_auth_date + ')';
             }
             
             let get_data_ban = data['data']['ban'];
+            let ban_state = '';
+            
             if(get_data_ban === '0') {
-                get_data_ban = lang_data['normal'];
+                ban_state = lang_data['normal'];
             } else {
-                get_data_ban = lang_data['ban'];
-                get_data_ban += '<br>';
-                
-                get_data_ban += lang_data['period'] + ' : ';
-                if(!data['data']['ban']['period']) {
-                    if(get_data_auth_date !== '0') {
-                        get_data_ban += '~ ' + get_data_auth_date;
-                    } else {
-                        get_data_ban += '~ ' + lang_data['limitless']; 
-                    }
-                } else if(data['data']['ban']['period'] === '0') {
-                    get_data_ban += '~ ' + lang_data['limitless']; 
+                let get_ban_do_type = get_data_ban[1].replace(/[a-zA-Z]/g, '');
+                let get_ban_range_type = get_data_ban[1].replace(/[0-9]/g, '');
+
+                if(get_ban_range_type === 'a') {
+                    ban_state = '<a href="/recent_block/regex">' + lang_data['ban'] + '</a>';
+                } else if(get_ban_range_type === 'b') {
+                    ban_state = '<a href="/recent_block/cidr">' + lang_data['ban'] + '</a>';
+                } else if(get_ban_range_type === 'c') {
+                    ban_state = data['data']['auth'];
                 } else {
-                    get_data_ban += '~ ' + data['data']['ban']['period'];
+                    ban_state = '<a href="/recent_block/user/' + opennamu_do_url_encode(name) + '">' + lang_data['ban'] + '</a>';
                 }
-                get_data_ban += '<br>';
-                
-                if(data['data']['ban']['reason'] === 'edit filter') {
-                    get_data_ban += lang_data['why'] + ' : <a href="/edit_filter/' + opennamu_do_url_encode(name) + '">' + data['data']['ban']['reason'] + '</a>';
-                } else {
-                    if(data['data']['ban']['reason']) {
-                        get_data_ban += lang_data['why'] + ' : ' + data['data']['ban']['reason'];
-                    }
+
+                if(get_data_ban[1] !== '') {
+                    ban_state += '<br>'
+                    ban_state += lang_data['type'] + ' : ' + get_data_ban[1];
                 }
             }
             
@@ -57,7 +52,7 @@ function do_insert_user_info() {
                     '</tr>' +
                     '<tr>' +
                         '<td>' + lang_data['state'] + '</td>' +
-                        '<td>' + get_data_ban + '</td>' +
+                        '<td>' + ban_state + '</td>' +
                     '</tr>' +
                     '<tr>' +
                         '<td>' + lang_data['level'] + '</td>' +