Procházet zdrojové kódy

버그 패치 및 help 폐기

2DU před 9 roky
rodič
revize
c1b3e68a6d
3 změnil soubory, kde provedl 16 přidání a 50 odebrání
  1. 7 41
      app.py
  2. 1 2
      set/set.json
  3. 8 7
      views/index.tpl

+ 7 - 41
app.py

@@ -1206,16 +1206,7 @@ def section_edit(name = None, num = None):
     else:        
         if(can == 1):
             return redirect('/ban')
-        else:
-            db_ex("select * from data where title = '" + db_pas(set_data["help"]) + "'")
-            rows = db_get()
-            if(rows):
-                newdata = re.sub('^#(?:redirect|넘겨주기)\s(?P<in>[^\n]*)', ' * [[\g<in>]] 문서로 넘겨주기', rows[0]["data"])
-                
-                left = namumark(session, name, newdata)
-            else:
-                left = ''
-                
+        else:                
             db_ex("select * from data where title = '" + db_pas(name) + "'")
             rows = db_get()
             if(rows):
@@ -1242,7 +1233,7 @@ def section_edit(name = None, num = None):
                 if(j == 0):
                     gdata = re.sub("\r\n$", "", gdata)
 
-                    return template('index', custom = custom_css_user(session), license = set_data['license'], login = login_check(session), title = name, logo = set_data['name'], page = url_pas(name), data = gdata, tn = 2, left = left, section = 1, number = num, sub = '편집')
+                    return template('index', custom = custom_css_user(session), license = set_data['license'], login = login_check(session), title = name, logo = set_data['name'], page = url_pas(name), data = gdata, tn = 2, section = 1, number = num, sub = '편집')
                 else:
                     return redirect('/w/' + url_pas(name))
             else:
@@ -1292,21 +1283,13 @@ def edit(name = None):
     else:        
         if(can == 1):
             return redirect('/ban')
-        else:
-            db_ex("select * from data where title = '" + db_pas(set_data["help"]) + "'")
-            rows = db_get()
-            if(rows):
-                newdata = re.sub('^#(?:redirect|넘겨주기)\s(?P<in>[^\n]*)', ' * [[\g<in>]] 문서로 넘겨주기', rows[0]["data"])
-                left = namumark(session, name, newdata)
-            else:
-                left = ''
-                
+        else:                
             db_ex("select * from data where title = '" + db_pas(name) + "'")
             rows = db_get()
             if(rows):
-                return template('index', custom = custom_css_user(session), license = set_data['license'], login = login_check(session), title = name, logo = set_data['name'], page = url_pas(name), data = rows[0]['data'], tn = 2, left = left, sub = '편집')
+                return template('index', custom = custom_css_user(session), license = set_data['license'], login = login_check(session), title = name, logo = set_data['name'], page = url_pas(name), data = rows[0]['data'], tn = 2, sub = '편집')
             else:
-                return template('index', custom = custom_css_user(session), license = set_data['license'], login = login_check(session), title = name, logo = set_data['name'], page = url_pas(name), data = '', tn = 2, left = left, sub = '편집')
+                return template('index', custom = custom_css_user(session), license = set_data['license'], login = login_check(session), title = name, logo = set_data['name'], page = url_pas(name), data = '', tn = 2, sub = '편집')
 
 @route('/preview/<name:path>/section/<num:int>', method=['POST'])
 def section_preview(name = None, num = None):
@@ -1320,16 +1303,8 @@ def section_preview(name = None, num = None):
         newdata = request.forms.content
         newdata = re.sub('^#(?:redirect|넘겨주기)\s(?P<in>[^\n]*)', ' * [[\g<in>]] 문서로 넘겨주기', newdata)
         enddata = namumark(session, name, newdata)
-        
-        db_ex("select * from data where title = '" + db_pas(set_data["help"]) + "'")
-        rows = db_get()
-        if(rows):
-            newdata = re.sub('^#(?:redirect|넘겨주기)\s(?P<in>[^\n]*)', ' * [[\g<in>]] 문서로 넘겨주기', rows[0]["data"])
-            left = namumark(session, name, newdata)
-        else:
-            left = ''
             
-        return template('index', custom = custom_css_user(session), license = set_data['license'], login = login_check(session), title = name, logo = set_data['name'], page = url_pas(name), data = request.forms.content, tn = 2, preview = 1, enddata = enddata, left = left, section = 1, number = num, odata = request.forms.otent, sub = '미리보기')
+        return template('index', custom = custom_css_user(session), license = set_data['license'], login = login_check(session), title = name, logo = set_data['name'], page = url_pas(name), data = request.forms.content, tn = 2, preview = 1, enddata = enddata, section = 1, number = num, odata = request.forms.otent, sub = '미리보기')
                 
 @route('/preview/<name:path>', method=['POST'])
 def preview(name = None):
@@ -1343,17 +1318,8 @@ def preview(name = None):
         newdata = request.forms.content
         newdata = re.sub('^#(?:redirect|넘겨주기)\s(?P<in>[^\n]*)', ' * [[\g<in>]] 문서로 넘겨주기', newdata)
         enddata = namumark(session, name, newdata)
-        
-        db_ex("select * from data where title = '" + db_pas(set_data["help"]) + "'")
-        rows = db_get()
-        if(rows):
-            newdata = re.sub('^#(?:redirect|넘겨주기)\s(?P<in>[^\n]*)', ' * [[\g<in>]] 문서로 넘겨주기', rows[0]["data"])
-            
-            left = namumark(session, name, newdata)
-        else:
-            left = ''
             
-        return template('index', custom = custom_css_user(session), license = set_data['license'], login = login_check(session), title = name, logo = set_data['name'], page = url_pas(name), data = request.forms.content, tn = 2, preview = 1, enddata = enddata, left = left, sub = '미리보기')
+        return template('index', custom = custom_css_user(session), license = set_data['license'], login = login_check(session), title = name, logo = set_data['name'], page = url_pas(name), data = request.forms.content, tn = 2, preview = 1, enddata = enddata, sub = '미리보기')
         
 @route('/delete/<name:path>', method=['POST', 'GET'])
 def delete(name = None):

+ 1 - 2
set/set.json

@@ -8,6 +8,5 @@
 	"license" : "CC 0",
 	"key" : "test",
 	"upload" : "2",
-	"port" : "3000",
-	"help" : ""
+	"port" : "3000"
 }

+ 8 - 7
views/index.tpl

@@ -210,13 +210,14 @@
                         </form>
                     % elif(tn == 5):
                         <form class="usrform" method='POST' action='/history/{{page}}/n/1'>
-                        <select name="a">
-                            {{!select}}
-                        </select>
-                        <select name="b">
-                            {{!select}}
-                        </select>
-                        <button class="btn btn-primary" type='submit'>리비전 비교</button>
+                            <select name="a">
+                                {{!select}}
+                            </select>
+                            <select name="b">
+                                {{!select}}
+                            </select>
+                            <button class="btn btn-primary" type='submit'>리비전 비교</button>
+                        </form>
                         <br>
                         <br>
                         {{!rows}}