Jelajahi Sumber

https://github.com/openNAMU/openNAMU/issues/1664

잉여개발기 (SPDV) 2 tahun lalu
induk
melakukan
fc68db5d75
4 mengubah file dengan 31 tambahan dan 3 penghapusan
  1. 11 1
      route/main_setting_phrase.py
  2. 5 0
      route/tool/func.py
  3. 14 1
      route/view_read.py
  4. 1 1
      version.json

+ 11 - 1
route/main_setting_phrase.py

@@ -32,7 +32,9 @@ def main_setting_phrase():
             'bbs_help',
             'bbs_comment_help',
             'outdated_doc_warning',
-            'outdated_doc_warning_date'
+            'outdated_doc_warning_date',
+            'category_text',
+            'redirect_text'
         ]
         if flask.request.method == 'POST':
             curs.executemany(db_change("update other set data = ? where name = ?"), [[flask.request.form.get(for_a, ''), for_a] for for_a in i_list])
@@ -136,6 +138,14 @@ def main_setting_phrase():
                         <hr class="main_hr">
                         <textarea class="opennamu_textarea_100" name="''' + i_list[23] + '''" placeholder="''' + load_lang('old_page_warning') + '''">''' + html.escape(d_list[23]) + '''</textarea>
 
+                        <h2>''' + load_lang('category') + '''</h2>
+                        <input name="''' + i_list[25] + '''" value="''' + html.escape(d_list[25]) + '''">
+
+                        <h2>''' + load_lang('redirect') + '''</h2>
+                        <span>EX : {0} ➤ {1}</span>
+                        <hr class="main_hr">
+                        <input name="''' + i_list[26] + '''" value="''' + html.escape(d_list[26]) + '''">
+
                         <hr class="main_hr">
                         <button id="opennamu_save_button" type="submit">''' + load_lang('save') + '''</button>
                     </form>

+ 5 - 0
route/tool/func.py

@@ -1323,6 +1323,11 @@ def render_set(doc_name = '', doc_data = '', data_type = 'view', data_in = '', d
                     'category' : load_lang('category')
                 }
 
+                curs.execute(db_change('select data from other where name = "category_text"'))
+                db_data = curs.fetchall()
+                if db_data and db_data[0][0] != '':
+                    render_lang_data['category'] = db_data[0][0]
+
                 get_class_render = class_do_render(conn, render_lang_data).do_render(doc_name, doc_data, data_type, data_in)
                 
                 if 'include' in get_class_render[2]:

+ 14 - 1
route/view_read.py

@@ -242,9 +242,22 @@ def view_read(name = 'Test', doc_rev = '', doc_from = '', do_type = ''):
                     if curs.fetchall():
                         break
 
+                redirect_text = '{0} ➤ {1}'
+
+                curs.execute(db_change('select data from other where name = "redirect_text"'))
+                db_data = curs.fetchall()
+                if db_data and db_data[0][0] != '':
+                    redirect_text = db_data[0][0]
+
+                try:
+                    redirect_text = redirect_text.format('<a href="/w_from/' + url_pas(last_page) + '">' + html.escape(last_page) + '</a>', '<b>' + html.escape(name) + '</b>')
+                except:
+                    redirect_text = '{0} ➤ {1}'
+                    redirect_text = redirect_text.format('<a href="/w_from/' + url_pas(last_page) + '">' + html.escape(last_page) + '</a>', '<b>' + html.escape(name) + '</b>')
+
                 end_data = '''
                     <div id="redirect">
-                        <a href="/w_from/''' + url_pas(last_page) + '''">''' + html.escape(last_page) + '''</a> ➤ <b>''' + html.escape(name) + '''</b>
+                        ''' + redirect_text + '''
                     </div>
                     <hr class="main_hr">
                 ''' + end_data

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC5-dev40",
+        "r_ver" : "v3.4.6-RC5-dev41",
         "c_ver" : "3500373",
         "s_ver" : "3500112"
     }