add: modal-edit support for inline-object tables

basxsoftwareassociation · May 23, 2022 · 4943cba · 4943cba
1 parent 4a9a8a3
commit 4943cba
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/basxconnect/core/layouts/editperson/common/addresses.py b/basxconnect/core/layouts/editperson/common/addresses.py
@@ -27,7 +27,7 @@ def numbers(request):
 
 
 def tile_with_datatable(model, queryset, columns, request):
-    modal = layout.modal.Modal.with_ajax_content(
+    addmodal = layout.modal.Modal.with_ajax_content(
         _("Add"),
         ModelHref(
             model,
@@ -36,23 +36,31 @@ def tile_with_datatable(model, queryset, columns, request):
         ),
         submitlabel=_("Save"),
     )
+
+    def editmodal():
+        return modal_with_trigger(
+            layout.modal.Modal.with_ajax_content(
+                _("Edit"),
+                ModelHref.from_object(hg.C("row"), "edit", query={"asajax": True}),
+                submitlabel=_("Save"),
+            ),
+            layout.button.Button,
+            notext=True,
+            small=True,
+            buttontype="ghost",
+            icon="edit",
+            label=_("Edit"),
+            _class="bx--overflow-menu",
+        )
+
     return tiling_col(
         layout.datatable.DataTable.from_queryset(
             queryset,
             model=model,
             prevent_automatic_sortingnames=True,
             columns=columns,
             rowactions=[
-                Link(
-                    href=ModelHref(
-                        model,
-                        "edit",
-                        kwargs={"pk": hg.C("row.pk")},
-                        query={"next": request.get_full_path()},
-                    ),
-                    iconname="edit",
-                    label=_("Edit"),
-                ),
+                editmodal(),
                 Link(
                     href=ModelHref(
                         model,
@@ -65,11 +73,11 @@ def tile_with_datatable(model, queryset, columns, request):
                 ),
             ],
             primary_button=layout.button.Button(
-                _("Add"), buttontype="primary", **modal.openerattributes
+                _("Add"), buttontype="primary", **addmodal.openerattributes
             ),
             style="border-top: none;",
         ),
-        modal,
+        addmodal,
     )
 
 

diff --git a/basxconnect/core/views/person/person_modals_views.py b/basxconnect/core/views/person/person_modals_views.py
@@ -241,6 +241,9 @@ def get_layout(self):
                 "",
             ),
         ]
+        if self.ajax_urlparameter in self.request.GET:
+            return layout.forms.Form(hg.C("form"), *form_fields)
+
         return layout.grid.Grid(
             hg.H3(_("Edit Email")),
             layout.grid.Row(