docs: Move search page

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

diff --git a/Makefile.am b/Makefile.am
index dd0104f59961fdda84619790702bd325df7a8d2b..af5143f76b4451427e5bc32d76fe99755c0687c6 100644 (file)
--- 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 f21f2822a4d3ecd7f5aa348b278c895212664066..6d29c48373841085810460574dd45facb7967f91 100644 (file)
--- 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 eaac0dc6ab3c1275784479bee1b8a9ae8acfb037..02f854ea2ee291f1bea12963a16548297104f649 100644 (file)
--- 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 bf9fe54e3325a80a83a07d832e72a4c64781b14f..ff82df2ae0df15a9200918f72a300ffa93efffc8 100644 (file)
--- 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)