From c5ae82b99b8e9f7864820f766cb8bf3b12933297 Mon Sep 17 00:00:00 2001 From: "Yi, EungJun" Date: Tue, 15 May 2012 15:42:34 +0900 Subject: [PATCH] app: Fix the url to delete a wikipage. --- app.coffee | 2 +- views/edit.jade | 3 ++- views/history.jade | 3 ++- views/page.jade | 3 ++- wikiApp.coffee | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app.coffee b/app.coffee index 6cacc480..c8433c56 100644 --- a/app.coffee +++ b/app.coffee @@ -61,7 +61,7 @@ app.get ROOT_PATH+'/pages', wikiApp.getPages # get page list app.get ROOT_PATH+'/pages/:name', wikiApp.getPage # get a page app.get ROOT_PATH+'/new', wikiApp.getNew # get a form to post new wikipage app.post ROOT_PATH+'/pages', wikiApp.postNew # post new wikipage -app.post ROOT_PATH+'/delete/:name', wikiApp.postDelete # delete wikipage +app.del ROOT_PATH+'/pages/:name', wikiApp.postDelete # delete wikipage app.post '/api/note/pages/:name', wikiApp.postRollback # wikipage rollback # Login & Logout diff --git a/views/edit.jade b/views/edit.jade index a2c65cea..ce44a4f1 100644 --- a/views/edit.jade +++ b/views/edit.jade @@ -12,7 +12,8 @@ block content div.btn-group a(href="?").btn View - form(method="post", action="/wikis/note/delete/"+title) + form(method="post", action="/wikis/note/pages/"+title) + input(type="hidden", name="_method", id='_method', value="delete") input(type="submit", value="delete", name="submit").btn br br diff --git a/views/history.jade b/views/history.jade index ef9c6af4..543854fb 100644 --- a/views/history.jade +++ b/views/history.jade @@ -42,7 +42,8 @@ block content a(href="?action=edit") Edit li a(href="?action=history") History - form(method="post", action="/wikis/note/delete/"+title) + form(method="post", action="/wikis/note/pages/"+title) + input(type="hidden", name="_method", id='_method', value="delete") input(type="submit", value="delete", name="submit") script(type="text/javascript", src="http://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js") diff --git a/views/page.jade b/views/page.jade index bb6a297f..34f17cef 100644 --- a/views/page.jade +++ b/views/page.jade @@ -27,8 +27,9 @@ block content a(href=urls.history).btn History div.span1 form(method="post", action=urls.delete) + input(type="hidden", name="_method", id='_method', value="delete") input(type="submit", value="delete", name="submit").btn div.row div.span12 - != content \ No newline at end of file + != content diff --git a/wikiApp.coffee b/wikiApp.coffee index 01e9eea6..81330453 100644 --- a/wikiApp.coffee +++ b/wikiApp.coffee @@ -117,7 +117,7 @@ commandUrls = (name) -> query: action: 'history', delete: url.format - pathname: ROOT_PATH + '/delete/' + name, + pathname: ROOT_PATH + '/pages/' + name, view = (name, req, res) -> wiki.getPage name, req.query.rev, (err, page) ->