2
0
Эх сурвалжийг харах

Merge pull request #2619 from openNAMU/tmp

버그 수정
잉여개발기 2 сар өмнө
parent
commit
12b9ae462b

+ 4 - 5
app.py

@@ -728,9 +728,8 @@ app.route('/random')(golang_view())
 app.route('/list/random')(golang_view())
 
 # Func-edit
-app.route('/edit/<everything:name>', methods = ['POST', 'GET'])(edit)
-app.route('/edit_from/<everything:name>', methods = ['POST', 'GET'], defaults = { 'do_type' : 'load' })(edit)
-app.route('/edit_section/<int:section>/<everything:name>', methods = ['POST', 'GET'])(edit)
+app.route('/edit/<everything:name>', methods = ['POST', 'GET'])(golang_view())
+app.route('/edit_from/<everything:name>', methods = ['POST', 'GET'])(golang_view())
 
 app.route('/edit_request/<everything:name>', methods = ['POST', 'GET'])(edit_request)
 app.route('/edit_request_from/<everything:name>', defaults = { 'do_type' : 'from' }, methods = ['POST', 'GET'])(edit_request)
@@ -789,8 +788,8 @@ app.route('/skin_set')(user_setting_skin_set)
 # 하위 호환용 E
 app.route('/change/skin_set/main', methods = ['POST', 'GET'])(user_setting_skin_set_main)
 
-app.route('/user')(user_info)
-app.route('/user/<name>')(user_info)
+app.route('/user')(golang_view())
+app.route('/user/<name>')(golang_view())
 
 app.route('/challenge', methods = ['GET', 'POST'])(user_challenge)
 

+ 0 - 1
route/__init__.py

@@ -113,7 +113,6 @@ from route.user_alarm import user_alarm
 from route.user_alarm_delete import user_alarm_delete
 from route.user_challenge import user_challenge
 from route.user_count import user_count
-from route.user_info import user_info
 from route.user_edit_filter import user_edit_filter
 
 from route.user_setting import user_setting

+ 0 - 1
route/tool/func_render_namumark.py

@@ -437,7 +437,6 @@ class class_do_render_namumark:
                     data_name = self.get_tool_data_storage(
                         '<h' + heading_level_str + '><span id="' + self.doc_set['doc_include'] + 'opennamu_heading_' + str(heading_count) + '_sub" style="opacity: ' + heading_folding[2] + '">', 
                             ' <sub>' + \
-                                '<a id="' + heading_id_name + '" href="/edit_section/' + str(heading_count) + '/' + url_pas(self.doc_name) + '">✎</a> ' + \
                                 '<a href="javascript:void(0);" onclick="javascript:opennamu_heading_folding(\'' + self.doc_set['doc_include'] + 'opennamu_heading_' + str(heading_count) + '\', this);">' + \
                                     heading_folding[0] + \
                                 '</a>'

+ 0 - 78
route/user_info.py

@@ -1,78 +0,0 @@
-from .tool.func import *
-
-async def user_info(name = ''):
-    with get_db_connect() as conn:
-        curs = conn.cursor()
-    
-        if name == '':
-            ip = ip_check()
-        else:
-            ip = name
-    
-        login_menu = ''
-        tool_menu = ''
-        
-        if name == '':
-            curs.execute(db_change("select count(*) from user_notice where name = ? and readme = ''"), [ip])
-            count = curs.fetchall()
-            if count and count[0][0] != 0:
-                tool_menu += '<li><a class="opennamu_not_exist_link" href="/alarm">' + await get_lang('alarm') + ' (' + str(count[0][0]) + ')</a></li>'
-            else:
-                tool_menu += '<li><a href="/alarm">' + await get_lang('alarm') + '</a></li>'
-    
-            if ip_or_user(ip) == 0:
-                login_menu += '''
-                    <li><a href="/logout">''' + await get_lang('logout') + '''</a></li>
-                    <li><a href="/change">''' + await get_lang('user_setting') + '''</a></li>
-                '''
-    
-                tool_menu += '<li><a href="/watch_list">' + await get_lang('watchlist') + '</a></li>'
-                tool_menu += '<li><a href="/star_doc">' + await get_lang('star_doc') + '</a></li>'
-                tool_menu += '<li><a href="/challenge">' + await get_lang('challenge_and_level_manage') + '</a></li>'
-                tool_menu += '<li><a href="/acl/user:' + url_pas(ip) + '">' + await get_lang('user_document_acl') + '</a></li>'
-            else:
-                login_menu += '''
-                    <li><a href="/login">''' + await get_lang('login') + '''</a></li>
-                    <li><a href="/register">''' + await get_lang('register') + '''</a></li>
-                    <li><a href="/change">''' + await get_lang('user_setting') + '''</a></li>
-                    <li><a href="/login/find">''' + await get_lang('password_search') + '''</a></li>
-                '''
-                
-            login_menu = '<h2>' + await get_lang('login') + '</h2><ul>' + login_menu + '</ul>'
-            tool_menu = '<h2>' + await get_lang('tool') + '</h2><ul>' + tool_menu + '</ul>'
-    
-        if await acl_check(tool = 'ban_auth') != 1:
-            curs.execute(db_change("select block from rb where block = ? and ongoing = '1'"), [ip])
-            ban_name = await get_lang('release') if curs.fetchall() else await get_lang('ban')
-            
-            admin_menu = '''
-                <h2>''' + await get_lang('admin') + '''</h2>
-                <ul>
-                    <li><a href="/auth/ban/''' + url_pas(ip) + '''">''' + ban_name + '''</a></li>
-                    <li><a href="/list/user/check_submit/''' + url_pas(ip) + '''">''' + await get_lang('check') + '''</a></li>
-                </ul>
-            '''
-        else:
-            admin_menu = ''
-                
-        return await render_template(
-            await get_lang('user_tool'),
-            '''
-                <h2>''' + await get_lang('state') + '''</h2>
-                <div id="opennamu_get_user_info">''' + html.escape(ip) + '''</div>
-                ''' + login_menu + '''
-                ''' + tool_menu + '''
-                <h2>''' + await get_lang('other') + '''</h2>
-                <ul>
-                    <li><a href="/record/''' + url_pas(ip) + '''">''' + await get_lang('edit_record') + '''</a></li>
-                    <li><a href="/record/topic/''' + url_pas(ip) + '''">''' + await get_lang('discussion_record') + '''</a></li>
-                    <li><a href="/record/bbs/''' + url_pas(ip) + '''">''' + await get_lang('bbs_record') + '''</a></li>
-                    <li><a href="/record/bbs_comment/''' + url_pas(ip) + '''">''' + await get_lang('bbs_comment_record') + '''</a></li>
-                    <li><a href="/topic/user:''' + url_pas(ip) + '''">''' + await get_lang('user_discussion') + '''</a></li>
-                    <li><a href="/count/''' + url_pas(ip) + '''">''' + await get_lang('count') + '''</a></li>
-                </ul>
-                ''' + admin_menu + '''
-            ''',
-            0,
-            [['other', await get_lang('other_tool')]]
-        )

+ 3 - 3
version.json

@@ -1,6 +1,6 @@
 {
-    "r_ver" : "v3.6.0-Beta-v54",
-    "c_ver" : "20250526",
+    "r_ver" : "v3.6.0-Beta-v56",
+    "c_ver" : "20250527",
     "s_ver" : "20240426",
-    "bin_link" : "https://github.com/openNAMU/GopenNAMU/releases/download/v2025-12-07-Beta-v12/"
+    "bin_link" : "https://github.com/openNAMU/GopenNAMU/releases/download/v2025-12-07-Beta-v13/"
 }