From 7f389434a43bb2bce4161d8a028636c45a59dc86 Mon Sep 17 00:00:00 2001 From: Tobias Kunze Date: Thu, 20 Mar 2025 09:46:59 +0100 Subject: [PATCH] Add organization dashboard and redirects --- src/servala/core/models/organization.py | 12 +++++++ .../dashboard.html} | 0 .../frontend/templates/includes/sidebar.html | 31 ++++++++++++------- src/servala/frontend/urls.py | 17 ++++++++-- src/servala/frontend/views/__init__.py | 3 +- src/servala/frontend/views/organization.py | 6 +++- 6 files changed, 54 insertions(+), 15 deletions(-) rename src/servala/frontend/templates/frontend/{index.html => organizations/dashboard.html} (100%) diff --git a/src/servala/core/models/organization.py b/src/servala/core/models/organization.py index 38bc699..8a1c552 100644 --- a/src/servala/core/models/organization.py +++ b/src/servala/core/models/organization.py @@ -1,5 +1,8 @@ from django.conf import settings from django.db import models +from django.urls import reverse +from django.utils.functional import cached_property +from django.utils.text import slugify from django.utils.translation import gettext_lazy as _ from .mixins import ServalaModelMixin @@ -29,6 +32,15 @@ class Organization(ServalaModelMixin, models.Model): verbose_name=_("Members"), ) + @cached_property + def slug(self): + return f"{slugify(self.name)}-{self.id}" + + def get_absolute_url(self): + return reverse( + "frontend:organization.dashboard", kwargs={"organization": self.slug} + ) + def set_owner(self, user): OrganizationMembership.objects.filter(user=user, organization=self).delete() OrganizationMembership.objects.create( diff --git a/src/servala/frontend/templates/frontend/index.html b/src/servala/frontend/templates/frontend/organizations/dashboard.html similarity index 100% rename from src/servala/frontend/templates/frontend/index.html rename to src/servala/frontend/templates/frontend/organizations/dashboard.html diff --git a/src/servala/frontend/templates/includes/sidebar.html b/src/servala/frontend/templates/includes/sidebar.html index 8c47293..1380052 100644 --- a/src/servala/frontend/templates/includes/sidebar.html +++ b/src/servala/frontend/templates/includes/sidebar.html @@ -5,7 +5,7 @@
@@ -66,7 +66,7 @@ {% else %} {# request.user.is_authenticated #}
  • - {% if user_organizations.count > 1 %} + {% if user_organizations.count %}
    • -
  • - - - {% translate 'Dashboard' %} - -
    • + {% if current_organization %} +
  • + + + {% translate 'Dashboard' %} + +
    • + {% endif %}
  • {% translate 'Account' %}
  • diff --git a/src/servala/frontend/urls.py b/src/servala/frontend/urls.py index fbaaa08..e947a7b 100644 --- a/src/servala/frontend/urls.py +++ b/src/servala/frontend/urls.py @@ -1,4 +1,5 @@ -from django.urls import path +from django.urls import include, path +from django.views.generic import RedirectView from servala.frontend import views @@ -10,5 +11,17 @@ urlpatterns = [ views.OrganizationCreateView.as_view(), name="organization.create", ), - path("", views.IndexView.as_view(), name="index"), + path( + "/", + include( + [ + path( + "", + views.OrganizationDashboardView.as_view(), + name="organization.dashboard", + ), + ] + ), + ), + path("", RedirectView.as_view(pattern_name="frontend:profile"), name="index"), ] diff --git a/src/servala/frontend/views/__init__.py b/src/servala/frontend/views/__init__.py index 20b4398..8dc1ee8 100644 --- a/src/servala/frontend/views/__init__.py +++ b/src/servala/frontend/views/__init__.py @@ -1,10 +1,11 @@ from .auth import LogoutView from .generic import IndexView, ProfileView -from .organization import OrganizationCreateView +from .organization import OrganizationCreateView, OrganizationDashboardView __all__ = [ "IndexView", "LogoutView", "OrganizationCreateView", + "OrganizationDashboardView", "ProfileView", ] diff --git a/src/servala/frontend/views/organization.py b/src/servala/frontend/views/organization.py index 020d28b..0091df1 100644 --- a/src/servala/frontend/views/organization.py +++ b/src/servala/frontend/views/organization.py @@ -1,4 +1,4 @@ -from django.views.generic import FormView +from django.views.generic import FormView, TemplateView from servala.frontend.forms import OrganizationCreateForm @@ -13,3 +13,7 @@ class OrganizationCreateView(FormView): def get_success_url(self): return "/" + + +class OrganizationDashboardView(TemplateView): + template_name = "frontend/organizations/dashboard.html"