From 78263dbd46d3970d01806e89b3799c5cd0bf6bbe Mon Sep 17 00:00:00 2001
From: George Katsikas <giorgakis.katsikas@gmail.com>
Date: Fri, 23 Feb 2024 16:03:20 +0100
Subject: [PATCH] refactor profile email adding form
---
scipost_django/profiles/forms.py | 27 ++++++++++++-------
.../profiles/_hx_profile_emails_table.html | 2 +-
scipost_django/profiles/views.py | 16 ++++++++---
3 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/scipost_django/profiles/forms.py b/scipost_django/profiles/forms.py
index 5bb4ce029..a464b79b8 100644
--- a/scipost_django/profiles/forms.py
+++ b/scipost_django/profiles/forms.py
@@ -8,7 +8,7 @@ from django import forms
from django.db.models import Q
from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Layout, Field, Div, Submit
+from crispy_forms.layout import Layout, Field, Div, Submit, Button, ButtonHolder
from crispy_bootstrap5.bootstrap5 import FloatingField
from dal import autocomplete
from django.forms import ChoiceField
@@ -260,19 +260,28 @@ class AddProfileEmailForm(forms.ModelForm):
self.helper.layout = Layout(
Div(
Div(
- Field("email", type="email", placeholder="Email address"),
+ FloatingField("email", type="email", placeholder="Email address"),
css_class="col",
),
- Div(Submit("submit", "Add"), css_class="col-auto mt-auto"),
+ Div(
+ ButtonHolder(
+ Submit("submit", "Add", css_class="btn btn-sm btn-primary"),
+ Button(
+ "cancel",
+ "Cancel",
+ css_class="btn btn-sm btn-secondary",
+ hx_get=reverse("common:empty"),
+ hx_target="closest " + kwargs.pop("cancel_parent_tag", "*"),
+ hx_swap="outerHTML",
+ ),
+ css_class="d-flex flex-column justify-content-between",
+ ),
+ css_class="col-auto",
+ ),
css_class="row",
),
)
- self.helper.attrs = {
- "hx-post": reverse(
- "profiles:_hx_add_profile_email", kwargs={"profile_id": self.profile.id}
- ),
- "hx-target": "#email-action-container",
- }
+ self.helper.attrs |= kwargs.pop("hx_attrs", {})
super().__init__(*args, **kwargs)
diff --git a/scipost_django/profiles/templates/profiles/_hx_profile_emails_table.html b/scipost_django/profiles/templates/profiles/_hx_profile_emails_table.html
index 87ada40c2..09586d770 100644
--- a/scipost_django/profiles/templates/profiles/_hx_profile_emails_table.html
+++ b/scipost_django/profiles/templates/profiles/_hx_profile_emails_table.html
@@ -1,4 +1,4 @@
-<table id="profile-emails-table" class="table table-sm table-borderless">
+<table class="table table-sm table-borderless">
<thead>
<tr>
<th colspan="2">Email</th>
diff --git a/scipost_django/profiles/views.py b/scipost_django/profiles/views.py
index 249d5ca5d..aafe0fa62 100644
--- a/scipost_django/profiles/views.py
+++ b/scipost_django/profiles/views.py
@@ -435,7 +435,19 @@ def _hx_add_profile_email(request, profile_id):
Add an email address to a Profile.
"""
profile = get_object_or_404(Profile, pk=profile_id)
- form = AddProfileEmailForm(request.POST or None, profile=profile, request=request)
+ form = AddProfileEmailForm(
+ request.POST or None,
+ profile=profile,
+ request=request,
+ hx_attrs={
+ "hx-post": reverse(
+ "profiles:_hx_add_profile_email", kwargs={"profile_id": profile.id}
+ ),
+ "hx-target": "next tbody",
+ "hx-swap": "beforeend",
+ },
+ cancel_parent_tag="form",
+ )
if form.is_valid():
profile_email = form.save()
response = TemplateResponse(
@@ -443,8 +455,6 @@ def _hx_add_profile_email(request, profile_id):
"profiles/_hx_profile_emails_table_row.html",
{"profile_mail": profile_email},
)
- response["HX-Retarget"] = "#profile-emails-table"
- response["HX-Reswap"] = "beforeend"
return response
--
GitLab