From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 26 Jun 2023 09:23:07 +0000 (+0000)
Subject: users: Move group handlers
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f39251eb1402417a900b742533649f1afc0daf47;p=ipfire.org.git

users: Move group handlers

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

diff --git a/Makefile.am b/Makefile.am
index f05467d0..166abdaf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -263,8 +263,6 @@ templates_people_DATA = \
 	src/templates/people/conferences.html \
 	src/templates/people/call.html \
 	src/templates/people/calls.html \
-	src/templates/people/group.html \
-	src/templates/people/groups.html \
 	src/templates/people/index.html \
 	src/templates/people/passwd.html \
 	src/templates/people/sip.html \
@@ -305,6 +303,12 @@ templates_users_DATA = \
 
 templates_usersdir = $(templatesdir)/users
 
+templates_users_groups_DATA = \
+	src/templates/users/groups/index.html \
+	src/templates/users/groups/show.html
+
+templates_users_groupsdir = $(templates_usersdir)/groups
+
 templates_users_modules_DATA = \
 	src/templates/users/modules/list.html
 
diff --git a/src/templates/people/groups.html b/src/templates/users/groups/index.html
similarity index 95%
rename from src/templates/people/groups.html
rename to src/templates/users/groups/index.html
index 71bb3655..ed589127 100644
--- a/src/templates/people/groups.html
+++ b/src/templates/users/groups/index.html
@@ -1,4 +1,4 @@
-{% extends "../base.html" %}
+{% extends "../../base.html" %}
 
 {% block title %}{{ _("Groups") }}{% end block %}
 
diff --git a/src/templates/people/group.html b/src/templates/users/groups/show.html
similarity index 95%
rename from src/templates/people/group.html
rename to src/templates/users/groups/show.html
index a31f6d66..63125b54 100644
--- a/src/templates/people/group.html
+++ b/src/templates/users/groups/show.html
@@ -1,4 +1,4 @@
-{% extends "../base.html" %}
+{% extends "../../base.html" %}
 
 {% block title %}{{ group }}{% end block %}
 
diff --git a/src/templates/users/show.html b/src/templates/users/show.html
index 29bc136b..644a95bf 100644
--- a/src/templates/users/show.html
+++ b/src/templates/users/show.html
@@ -200,7 +200,7 @@
 
 								<nav class="panel">
 									{% for g in account.groups %}
-										<a class="panel-block" href="/groups/{{ g.gid }}">
+										<a class="panel-block" href="/users/groups/{{ g.gid }}">
 											<span class="panel-icon">
 												<i class="fas fa-users" aria-hidden="true"></i>
 											</span>
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 784cd8cd..6819343c 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -159,6 +159,10 @@ class Application(tornado.web.Application):
 			(r"/users/([a-z_][a-z0-9_-]{0,31})", users.ShowHandler),
 			(r"/users/([a-z_][a-z0-9_-]{0,31})\.jpg", users.AvatarHandler),
 
+			# User Groups
+			(r"/users/groups", users.GroupIndexHandler),
+			(r"/users/groups/([a-z_][a-z0-9_-]{0,31})", users.GroupShowHandler),
+
 			# RSS feed
 			(r"/news.rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.xml" }),
 
@@ -305,8 +309,6 @@ class Application(tornado.web.Application):
 			(r"/", people.IndexHandler),
 			(r"/activate/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.ActivateHandler),
 			(r"/conferences", people.ConferencesHandler),
-			(r"/groups", people.GroupsHandler),
-			(r"/groups/([a-z_][a-z0-9_-]{0,31})", people.GroupHandler),
 			(r"/register", auth.RegisterHandler),
 			(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),
diff --git a/src/web/people.py b/src/web/people.py
index b4d68895..b0258e35 100644
--- a/src/web/people.py
+++ b/src/web/people.py
@@ -65,31 +65,6 @@ class ConferencesHandler(auth.CacheMixin, base.BaseHandler):
 		self.render("people/conferences.html", conferences=self.backend.talk.conferences)
 
 
-class GroupsHandler(auth.CacheMixin, base.BaseHandler):
-	@tornado.web.authenticated
-	def get(self):
-		# Only staff can see other groups
-		if not self.current_user.is_staff():
-			raise tornado.web.HTTPError(403)
-
-		self.render("people/groups.html")
-
-
-class GroupHandler(auth.CacheMixin, base.BaseHandler):
-	@tornado.web.authenticated
-	def get(self, gid):
-		# Only staff can see other groups
-		if not self.current_user.is_staff():
-			raise tornado.web.HTTPError(403)
-
-		# Fetch group
-		group = self.backend.groups.get_by_gid(gid)
-		if not group:
-			raise tornado.web.HTTPError(404, "Could not find group %s" % gid)
-
-		self.render("people/group.html", group=group)
-
-
 class SubscribeHandler(auth.CacheMixin, base.BaseHandler):
 	@tornado.web.authenticated
 	def post(self):
diff --git a/src/web/users.py b/src/web/users.py
index 9b12e624..1453c6d4 100644
--- a/src/web/users.py
+++ b/src/web/users.py
@@ -143,6 +143,31 @@ class AvatarHandler(base.BaseHandler):
 			return f.getvalue()
 
 
+class GroupIndexHandler(auth.CacheMixin, base.BaseHandler):
+	@tornado.web.authenticated
+	def get(self):
+		# Only staff can see other groups
+		if not self.current_user.is_staff():
+			raise tornado.web.HTTPError(403)
+
+		self.render("users/groups/index.html")
+
+
+class GroupShowHandler(auth.CacheMixin, base.BaseHandler):
+	@tornado.web.authenticated
+	def get(self, gid):
+		# Only staff can see other groups
+		if not self.current_user.is_staff():
+			raise tornado.web.HTTPError(403)
+
+		# Fetch group
+		group = self.backend.groups.get_by_gid(gid)
+		if not group:
+			raise tornado.web.HTTPError(404, "Could not find group %s" % gid)
+
+		self.render("users/groups/show.html", group=group)
+
+
 class ListModule(ui_modules.UIModule):
 	def render(self, accounts, show_created_at=False):
 		return self.render_string("users/modules/list.html", accounts=accounts,