From: Michael Tremer Date: Sat, 24 Jun 2023 19:37:19 +0000 (+0000) Subject: people: Drop search X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7014afeb16f6b51c73fbdfca5546e9abc8dc77d;p=ipfire.org.git people: Drop search Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index 0c821370..0bb18b33 100644 --- 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 index cd10b89b..00000000 --- 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 %} -
-
-

{{ _("Search Results") }}

- -

- {{ _("For '%s'") % q }} -

-
-
- -
-
- {% if accounts %} - {% module AccountsList(accounts) %} - {% else %} -

- {{ _("There are no results for \"%s\"") % q }} -

- {% end %} -
-
-{% end block %} diff --git a/src/web/__init__.py b/src/web/__init__.py index 9c0480aa..19ef51a3 100644 --- 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 077240a7..7f12d87b 100644 --- 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):