Group management form converted to crispy forms. Page for group list improved

user_manager/forms.py

@@ -4,6 +4,8 @@ from django.contrib.auth.models import User
 from .models import UserAcl
 from django.core.exceptions import ValidationError
 from wireguard.models import PeerGroup
+from crispy_forms.helper import FormHelper
+from crispy_forms.layout import Layout, Row, Column, Submit, HTML
 
 
 class UserAclForm(UserCreationForm):
@@ -56,8 +58,37 @@ class PeerGroupForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         self.user_id = kwargs.pop('user_id', None)
         super().__init__(*args, **kwargs)
+        self.helper = FormHelper()
+        self.helper.form_method = 'post'
         
-        
+        if self.instance.pk:
+            delete_html = "<a href='javascript:void(0)' class='btn btn-outline-danger' data-command='delete' onclick='openCommandDialog(this)'>Delete</a>"
+        else:
+            delete_html = ''
+            
+        self.helper.layout = Layout(
+            Row(
+                Column('name', css_class='form-group col-md-12 mb-0'),
+                css_class='form-row'
+            ),
+            Row(
+                Column('peer', css_class='form-group col-md-12 mb-0'),
+                css_class='form-row'
+            ),
+            Row(
+                Column('server_instance', css_class='form-group col-md-12 mb-0'),
+                css_class='form-row'
+            ),
+            Row(
+                Column(
+                    Submit('submit', 'Save', css_class='btn btn-success'),
+                    HTML(' <a class="btn btn-secondary" href="/user/peer-group/list/">Back</a> '),
+                    HTML(delete_html),
+                    css_class='col-md-12'),
+                css_class='form-row'
+            )
+        )
+
     def clean(self):
         cleaned_data = super().clean()
         name = cleaned_data.get('name')
@@ -68,6 +99,7 @@ class PeerGroupForm(forms.ModelForm):
             raise ValidationError("A peer group with that name already exists.")
 
         return cleaned_data
+    
     def save(self, commit=True):
         peer_group = super().save(commit=False)
         

user_manager/views.py

@@ -30,11 +30,12 @@ def view_peer_group_manage(request):
         page_title = 'Edit Peer Group ' + peer_group.name
         if request.GET.get('action') == 'delete':
             group_name = peer_group.name
-            if request.GET.get('confirmation') == group_name:
+            if request.GET.get('confirmation') == 'delete':
                 peer_group.delete()
                 messages.success(request, 'Peer Group deleted|The peer group ' + group_name + ' has been deleted.')
                 return redirect('/user/peer-group/list/')
-            
+            else:
+                messages.warning(request, 'Peer Group not deleted|Invalid confirmation.')
             return redirect('/user/peer-group/list/')
     else:
         form = PeerGroupForm(user_id=request.user.id)
@@ -50,8 +51,19 @@ def view_peer_group_manage(request):
             peer_group = form.save()
             form.save_m2m()
             return redirect('/user/peer-group/list/')
-    context = {'page_title': page_title, 'form': form, 'peer_group': peer_group}
-    return render(request, 'user_manager/manage_peer_group.html', context)
+        
+    form_description = {
+        'size': '',
+        'content': '''
+        <h5>Peers</h5>
+        <p>Select which peers can be managed by users with this peer group.</p>
+
+        <h5>WireGuard Instances</h5>
+        <p>All peers in this WireGuard instance can be managed by users with this peer group, including adding or removing peers.</p>
+        '''
+    }
+    context = {'page_title': page_title, 'form': form, 'peer_group': peer_group, 'instance': peer_group, 'form_description': form_description}
+    return render(request, 'generic_form.html', context)
 
 
 @login_required