From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 30 May 2019 10:54:44 +0000 (+0100)
Subject: wiki: Change watch/unwatch URL schema
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9db2e89f0b577dc03790607a4529a3136d3ef10e;p=ipfire.org.git

wiki: Change watch/unwatch URL schema

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/templates/wiki/page.html b/src/templates/wiki/page.html
index e9f99acc..e962400d 100644
--- a/src/templates/wiki/page.html
+++ b/src/templates/wiki/page.html
@@ -25,9 +25,9 @@
 	<p class="small text-muted">
 		{% if current_user %}
 			{% if page.is_watched_by(current_user) %}
-				<a href="/action/unwatch{{ page.url }}"><span class="fas fa-star" title="{{ _("Stop watching this page") }}"></span></a>
+				<a href="{{ page.url }}/_unwatch"><span class="fas fa-star" title="{{ _("Stop watching this page") }}"></span></a>
 			{% else %}
-				<a href="/action/watch{{ page.url }}"><span class="far fa-star" title="{{ _("Watch this page") }}"></span></a>
+				<a href="{{ page.url }}/_watch"><span class="far fa-star" title="{{ _("Watch this page") }}"></span></a>
 			{% end %} &bull;
 		{% end %}
 
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 233debfe..d5e7022f 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -290,7 +290,7 @@ class Application(tornado.web.Application):
 
 			# Actions
 			(r"([A-Za-z0-9\-_\/]+)?/_edit", wiki.ActionEditHandler),
-			(r"/action/(watch|unwatch)(.*)", wiki.ActionWatchHandler),
+			(r"([A-Za-z0-9\-_\/]+)?/_(watch|unwatch)", wiki.ActionWatchHandler),
 			(r"/actions/upload", wiki.ActionUploadHandler),
 
 			# Handlers
diff --git a/src/web/wiki.py b/src/web/wiki.py
index 55c0911a..aca1f7b9 100644
--- a/src/web/wiki.py
+++ b/src/web/wiki.py
@@ -86,7 +86,7 @@ class ActionUploadHandler(auth.CacheMixin, base.BaseHandler):
 
 class ActionWatchHandler(auth.CacheMixin, base.BaseHandler):
 	@tornado.web.authenticated
-	def get(self, action, path):
+	def get(self, path, action):
 		page = self.backend.wiki.get_page(path)
 		if not page:
 			raise tornado.web.HTTPError(404, "Page does not exist: %s" % path)