fix redirect

app.py

@@ -369,7 +369,7 @@ app.route('/down/<everything:name>')(view_down)
 
 # everything 다음에 추가 붙은 경우에 대해서 재검토 필요 (진행중)
 app.route('/w_rev/<int(signed = True):doc_rev>/<everything:name>')(view_read)
-app.route('/w_from/<everything:name>')(view_read)
+app.route('/w_from/<everything:name>', defaults = { 'do_type' : 'from' })(view_read)
 app.route('/w/<everything:name>')(view_read)
 
 app.route('/random')(main_func_random)

route/view_read.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def view_read(name = 'Test', doc_rev = 0, doc_from = ''):
+def view_read(name = 'Test', doc_rev = 0, doc_from = '', do_type = ''):
     with get_db_connect() as conn:
         curs = conn.cursor()
 
@@ -12,8 +12,7 @@ def view_read(name = 'Test', doc_rev = 0, doc_from = ''):
         file_data = ''
 
         ip = ip_check()
-
-        # name_doc_pass = flask.request.cookies.get('opennamu_redirect', '')
+            
         uppage = re.sub(r"/([^/]+)$", '', name)
         uppage = 0 if uppage == name else uppage
         num = str(doc_rev)        
@@ -155,16 +154,19 @@ def view_read(name = 'Test', doc_rev = 0, doc_from = ''):
                 ['acl/' + url_pas(name), load_lang('acl'), acl],
             ]
 
-            """
-            if name_doc_pass != '':
+            if do_type == 'from':
                 menu += [['w/' + url_pas(name), load_lang('pass')]]
-                end_data = '''
-                    <div id="redirect">
-                        <a href="/w/''' + url_pas(name_doc_pass) + '/doc_from/' + url_pas(name) + '">' + name_doc_pass + '</a> ⇨ <b>' + name + '''</b>
-                    </div>
-                    <br>
-                ''' + end_data
-            """
+                if flask.session and 'lastest_document' in flask.session:
+                    end_data = '''
+                        <div id="redirect">
+                            <a href="/w_from/''' + url_pas(flask.session['lastest_document']) + '''">''' + flask.session['lastest_document'] + '''</a> ⇨ <b>''' + name + '''</b>
+                        </div>
+                        <br>
+                    ''' + end_data
+                    
+                flask.session['lastest_document'] = name
+            else:
+                flask.session['lastest_document'] = name
 
             if uppage != 0:
                 menu += [['w/' + url_pas(uppage), load_lang('upper')]]

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.5 (stable1) (beta3) (dev13)",
+        "r_ver" : "v3.4.5 (stable1) (beta3) (dev14)",
         "c_ver" : "3500107",
         "s_ver" : "3500110"
     }

views/main_css/js/render_onmark.js

@@ -1301,7 +1301,6 @@ function do_onmark_redirect_render(data, data_js, name_doc) {
         var link_main = link_data_var[0];
         var link_sub = link_data_var[1];
         
-        // 임시 조치
         if(
             name_include == '' &&
             window.location.search === '' &&