people: Drop search

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

diff --git a/Makefile.am b/Makefile.am
index 0c8213707aeade105feee42ce3e419d916299150..0bb18b3349eededec53da019e6a09bccdffd39db 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -267,7 +267,6 @@ templates_people_DATA = \
        src/templates/people/groups.html \
        src/templates/people/index.html \
        src/templates/people/passwd.html \
-       src/templates/people/search.html \
        src/templates/people/sip.html \
        src/templates/people/stats.html \
        src/templates/people/subscribed.html \

diff --git a/src/templates/people/search.html b/src/templates/people/search.html
deleted file mode 100644 (file)
index cd10b89..0000000
--- a/src/templates/people/search.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends "../base.html" %}
-
-{% block title %}{{ _("Search Results for \"%s\"") % q }}{% end block %}
-
-{% block container %}
-       <div class="header">
-               <div class="container">
-                       <h1>{{ _("Search Results") }}</h1>
-
-                       <p class="text-muted">
-                               {{ _("For '%s'") % q }}
-                       </p>
-               </div>
-       </div>
-
-       <div class="container">
-               <section>
-                       {% if accounts %}
-                               {% module AccountsList(accounts) %}
-                       {% else %}
-                               <p class="text-muted text-center my-5">
-                                       {{ _("There are no results for \"%s\"") % q }}
-                               </p>
-                       {% end %}
-               </section>
-       </div>
-{% end block %}

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 9c0480aa9576340c8f5b3976a7467d7b60416553..19ef51a3b8f5c33503113e591f234bbf416fc889 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -304,7 +304,6 @@ class Application(tornado.web.Application):
                        (r"/groups", people.GroupsHandler),
                        (r"/groups/([a-z_][a-z0-9_-]{0,31})", people.GroupHandler),
                        (r"/register", auth.RegisterHandler),
-                       (r"/search", people.SearchHandler),
                        (r"/users/([a-z_][a-z0-9_-]{0,31})/calls/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})", people.CallHandler),
                        (r"/users/([a-z_][a-z0-9_-]{0,31})/calls(?:/(\d{4}-\d{2}-\d{2}))?", people.CallsHandler),
                        (r"/users/([a-z_][a-z0-9_-]{0,31})/edit", people.UserEditHandler),

diff --git a/src/web/people.py b/src/web/people.py
index 077240a769ccd3c1880d23fac71fbc5605261d7c..7f12d87b83e6857fe9262fe446bb4db2e8854630 100644 (file)
--- a/src/web/people.py
+++ b/src/web/people.py
@@ -90,22 +90,6 @@ class GroupHandler(auth.CacheMixin, base.BaseHandler):
                self.render("people/group.html", group=group)
 
 
-class SearchHandler(auth.CacheMixin, base.BaseHandler):
-       @tornado.web.authenticated
-       def get(self):
-               q = self.get_argument("q")
-
-               # Perform the search
-               accounts = self.backend.accounts.search(q)
-
-               # Redirect when only one result was found
-               if len(accounts) == 1:
-                       self.redirect("/users/%s" % accounts[0].uid)
-                       return
-
-               self.render("people/search.html", q=q, accounts=accounts)
-
-
 class StatsHandler(auth.CacheMixin, base.BaseHandler):
        @tornado.web.authenticated
        def get(self):