From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 1 Jul 2023 10:24:26 +0000 (+0000)
Subject: docs: Move search page
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ce8cc327030ffb1046ec29e444c36d6ef0f3c8d;p=ipfire.org.git

docs: Move search page

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

diff --git a/Makefile.am b/Makefile.am
index dd0104f5..af5143f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -203,7 +203,8 @@ templates_docs_DATA = \
 	src/templates/docs/confirm-restore.html \
 	src/templates/docs/diff.html \
 	src/templates/docs/page.html \
-	src/templates/docs/revisions.html
+	src/templates/docs/revisions.html \
+	src/templates/docs/search-results.html
 
 templates_docsdir = $(templatesdir)/docs
 
@@ -346,7 +347,6 @@ templates_wiki_DATA = \
 	src/templates/wiki/confirm-delete.html \
 	src/templates/wiki/edit.html \
 	src/templates/wiki/recent-changes.html \
-	src/templates/wiki/search-results.html \
 	src/templates/wiki/tree.html \
 	src/templates/wiki/watchlist.html
 
diff --git a/src/templates/wiki/search-results.html b/src/templates/docs/search-results.html
similarity index 100%
rename from src/templates/wiki/search-results.html
rename to src/templates/docs/search-results.html
diff --git a/src/web/__init__.py b/src/web/__init__.py
index f21f2822..6d29c483 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -142,6 +142,7 @@ class Application(tornado.web.Application):
 			(r"/blog/([0-9a-z\-\._]+)/publish", blog.PublishHandler),
 
 			# Docs
+			(r"/docs/search", docs.SearchHandler),
 			(r"/docs((?:[A-Za-z0-9\-_\/]+)?(?:.*)\.(?:\w+))$", docs.FileHandler),
 			(r"/docs([A-Za-z0-9\-_\/]+)?", docs.PageHandler),
 
@@ -351,7 +352,6 @@ class Application(tornado.web.Application):
 
 			# Handlers
 			(r"/recent\-changes", wiki.RecentChangesHandler),
-			(r"/search", wiki.SearchHandler),
 			(r"/tree", wiki.TreeHandler),
 			(r"/watchlist", wiki.WatchlistHandler),
 
diff --git a/src/web/docs.py b/src/web/docs.py
index eaac0dc6..02f854ea 100644
--- a/src/web/docs.py
+++ b/src/web/docs.py
@@ -138,6 +138,18 @@ class FileHandler(base.BaseHandler):
 		self.finish(blob)
 
 
+class SearchHandler(base.BaseHandler):
+	@base.ratelimit(minutes=5, requests=25)
+	def get(self):
+		q = self.get_argument("q")
+
+		# Perform search
+		with self.db.transaction():
+			pages = self.backend.wiki.search(q, account=self.current_user, limit=50)
+
+		self.render("docs/search-results.html", q=q, pages=pages)
+
+
 class HeaderModule(ui_modules.UIModule):
 	@property
 	def page(self):
diff --git a/src/web/wiki.py b/src/web/wiki.py
index bf9fe54e..ff82df2a 100644
--- a/src/web/wiki.py
+++ b/src/web/wiki.py
@@ -210,16 +210,6 @@ class FilesHandler(base.BaseHandler):
 		self.render("wiki/files/index.html", path=path, files=files)
 
 
-class SearchHandler(base.BaseHandler):
-	@base.ratelimit(minutes=5, requests=25)
-	def get(self):
-		q = self.get_argument("q")
-
-		pages = self.backend.wiki.search(q, account=self.current_user, limit=50)
-
-		self.render("wiki/search-results.html", q=q, pages=pages)
-
-
 class RecentChangesHandler(base.BaseHandler):
 	def get(self):
 		recent_changes = self.backend.wiki.get_recent_changes(self.current_user, limit=50)