From b6571ede2c086cbf86d5bcaf489096ec1d45177c Mon Sep 17 00:00:00 2001 From: Tobias Kunze Date: Thu, 20 Mar 2025 14:31:33 +0100 Subject: [PATCH] Add organization edit view --- src/servala/frontend/forms/__init__.py | 4 +- src/servala/frontend/forms/organization.py | 3 +- .../frontend/organizations/update.html | 50 +++++++++++++++++++ .../frontend/templates/includes/sidebar.html | 10 +++- src/servala/frontend/urls.py | 5 ++ src/servala/frontend/views/__init__.py | 7 ++- src/servala/frontend/views/organization.py | 31 ++++++++++-- 7 files changed, 101 insertions(+), 9 deletions(-) create mode 100644 src/servala/frontend/templates/frontend/organizations/update.html diff --git a/src/servala/frontend/forms/__init__.py b/src/servala/frontend/forms/__init__.py index fe0ffc1..01447a1 100644 --- a/src/servala/frontend/forms/__init__.py +++ b/src/servala/frontend/forms/__init__.py @@ -1,4 +1,4 @@ -from .organization import OrganizationCreateForm +from .organization import OrganizationForm from .profile import UserProfileForm -__all__ = ["OrganizationCreateForm", "UserProfileForm"] +__all__ = ["OrganizationForm", "UserProfileForm"] diff --git a/src/servala/frontend/forms/organization.py b/src/servala/frontend/forms/organization.py index b6a3391..41cc26c 100644 --- a/src/servala/frontend/forms/organization.py +++ b/src/servala/frontend/forms/organization.py @@ -1,9 +1,10 @@ from django.forms import ModelForm from servala.core.models import Organization +from servala.frontend.forms.mixins import HtmxMixin -class OrganizationCreateForm(ModelForm): +class OrganizationForm(HtmxMixin, ModelForm): class Meta: model = Organization fields = ("name",) diff --git a/src/servala/frontend/templates/frontend/organizations/update.html b/src/servala/frontend/templates/frontend/organizations/update.html new file mode 100644 index 0000000..234622a --- /dev/null +++ b/src/servala/frontend/templates/frontend/organizations/update.html @@ -0,0 +1,50 @@ +{% extends "frontend/base.html" %} +{% load i18n static %} +{% load partials %} +{% block html_title %} + {% block page_title %} + {% translate "Organization Details" %} + {% endblock page_title %} +{% endblock html_title %} +{% partialdef org-name %} + + {{ form.instance.name }} + + +{% endpartialdef org-name %} +{% partialdef org-name-edit %} + +
+
+ {{ form.name.as_field_group }} + + + + +
+
+ +{% endpartialdef org-name-edit %} +{% block card_content %} +
+ + + + + {% partial org-name %} + + +
+ {% translate "Name" %} +
+
+{% endblock card_content %} diff --git a/src/servala/frontend/templates/includes/sidebar.html b/src/servala/frontend/templates/includes/sidebar.html index 1078d4b..a04bc5d 100644 --- a/src/servala/frontend/templates/includes/sidebar.html +++ b/src/servala/frontend/templates/includes/sidebar.html @@ -103,12 +103,18 @@ {% else %} {% if request.organization %}
  • - + {% translate 'Dashboard' %}
    • +
  • {% translate 'Organization' %}
    • +
  • + + + {% translate 'Details' %} + +
    • {% endif %}
  • {% translate 'Account' %}
  • diff --git a/src/servala/frontend/urls.py b/src/servala/frontend/urls.py index f247f17..59a7ccc 100644 --- a/src/servala/frontend/urls.py +++ b/src/servala/frontend/urls.py @@ -15,6 +15,11 @@ urlpatterns = [ "org//", include( [ + path( + "details/", + views.OrganizationUpdateView.as_view(), + name="organization.details", + ), path( "", views.OrganizationDashboardView.as_view(), diff --git a/src/servala/frontend/views/__init__.py b/src/servala/frontend/views/__init__.py index 8dc1ee8..4ff574a 100644 --- a/src/servala/frontend/views/__init__.py +++ b/src/servala/frontend/views/__init__.py @@ -1,11 +1,16 @@ from .auth import LogoutView from .generic import IndexView, ProfileView -from .organization import OrganizationCreateView, OrganizationDashboardView +from .organization import ( + OrganizationCreateView, + OrganizationDashboardView, + OrganizationUpdateView, +) __all__ = [ "IndexView", "LogoutView", "OrganizationCreateView", "OrganizationDashboardView", + "OrganizationUpdateView", "ProfileView", ] diff --git a/src/servala/frontend/views/organization.py b/src/servala/frontend/views/organization.py index dc0f1fd..91fcb2a 100644 --- a/src/servala/frontend/views/organization.py +++ b/src/servala/frontend/views/organization.py @@ -1,11 +1,14 @@ from django.shortcuts import redirect -from django.views.generic import FormView, TemplateView +from django.utils.functional import cached_property +from django.views.generic import FormView, TemplateView, UpdateView -from servala.frontend.forms import OrganizationCreateForm +from servala.core.models import Organization +from servala.frontend.forms import OrganizationForm +from servala.frontend.views.mixins import HtmxMixin class OrganizationCreateView(FormView): - form_class = OrganizationCreateForm + form_class = OrganizationForm template_name = "frontend/organizations/create.html" def form_valid(self, form): @@ -17,3 +20,25 @@ class OrganizationCreateView(FormView): class OrganizationDashboardView(TemplateView): template_name = "frontend/organizations/dashboard.html" + + +class OrganizationUpdateView(HtmxMixin, UpdateView): + template_name = "frontend/organizations/update.html" + form_class = OrganizationForm + fragments = ("org-name", "org-name-edit") + model = Organization + context_object_name = "organization" + + def get_success_url(self): + return self.request.path + + def get_object(self): + return self.request.organization + + @cached_property + def object(self): + return self.get_object() + + def form_valid(self, form): + form.save() + return super().form_valid(form)