From 40cb87a4ad9049d433640fdf1784d03951e2b754 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 30 May 2019 11:50:26 +0100
Subject: [PATCH] wiki: Change URL type for edits

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/templates/wiki/404.html  | 2 +-
 src/templates/wiki/edit.html | 4 +---
 src/templates/wiki/page.html | 2 +-
 src/web/__init__.py          | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/templates/wiki/404.html b/src/templates/wiki/404.html
index 9fc12c04..bd3a4a53 100644
--- a/src/templates/wiki/404.html
+++ b/src/templates/wiki/404.html
@@ -15,7 +15,7 @@
                         {{ _("This wiki page does not exist, yet.") }}
                     </p>
 
-                    <a class="btn btn-primary btn-block" href="/actions/edit/{{ request.path }}">
+                    <a class="btn btn-primary btn-block" href="{{ request.path }}/_edit">
                         {{ _("Create Now") }}
                     </a>
                 </div>
diff --git a/src/templates/wiki/edit.html b/src/templates/wiki/edit.html
index e96588b3..c5bec0ea 100644
--- a/src/templates/wiki/edit.html
+++ b/src/templates/wiki/edit.html
@@ -17,11 +17,9 @@
 				{% if page %}{{ _("Edit %s") % page.title }}{% else %}{{ _("Create A New Page") }}{% end %}
 			</h4>
 
-			<form action="/actions/edit" method="POST">
+			<form action="" method="POST">
 				{% raw xsrf_form_html() %}
 
-				<input type="hidden" name="path" value="{{ request.path }}">
-
 				<div class="form-group">
 					<textarea class="form-control" rows="16" name="content" placeholder="{{ _("Text") }}"
 						>{% if page and page.markdown %}{{ page.markdown }}{% end %}</textarea>
diff --git a/src/templates/wiki/page.html b/src/templates/wiki/page.html
index c6ba9e3f..e9f99acc 100644
--- a/src/templates/wiki/page.html
+++ b/src/templates/wiki/page.html
@@ -17,7 +17,7 @@
 		</div>
 	</div>
 
-	<a class="btn btn-primary btn-block mb-3" href="/actions/edit{{ request.path }}">
+	<a class="btn btn-primary btn-block mb-3" href="{{ request.path }}/_edit">
 		<span class="fas fa-edit mr-2"></span> {{ _("Edit Page") }}
 		{% if not current_user %}&dash; {{ _("Yes, you can edit!") }}{% end %}
 	</a>
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 7535e686..233debfe 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -289,7 +289,7 @@ class Application(tornado.web.Application):
 			authentication_handlers + [
 
 			# Actions
-			(r"/actions/edit([A-Za-z0-9\-_\/]+)", wiki.ActionEditHandler),
+			(r"([A-Za-z0-9\-_\/]+)?/_edit", wiki.ActionEditHandler),
 			(r"/action/(watch|unwatch)(.*)", wiki.ActionWatchHandler),
 			(r"/actions/upload", wiki.ActionUploadHandler),
 
-- 
2.47.2