Enhance user management: Added 'Peer Groups' column to user list, updated UserAclForm to include peer group selection, and improved user management view with detailed descriptions for user levels and peer groups.

user_manager/forms.py

@@ -8,20 +8,67 @@ from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Row, Column, Submit, HTML
 
 
-class UserAclForm(UserCreationForm):
+class UserAclForm(forms.Form):
+    username = forms.CharField(max_length=150)
+    password1 = forms.CharField(widget=forms.PasswordInput, required=False, label="Password")
+    password2 = forms.CharField(widget=forms.PasswordInput, required=False, label="Password confirmation")
     user_level = forms.ChoiceField(choices=UserAcl.user_level.field.choices, required=True, label="User Level")
-
-    class Meta(UserCreationForm.Meta):
-        model = User
-        fields = UserCreationForm.Meta.fields + ('user_level',)
+    peer_groups = forms.ModelMultipleChoiceField(
+        queryset=PeerGroup.objects.all(),
+        required=False,
+    )
 
     def __init__(self, *args, **kwargs):
+        self.instance = kwargs.pop('instance', None)
         self.user_id = kwargs.pop('user_id', None)
         super().__init__(*args, **kwargs)
-        if self.instance and self.instance.pk:
-            self.fields['password1'].required = False
-            self.fields['password2'].required = False
+
+        if self.instance:
+            self.fields['username'].initial = self.instance.username
             self.fields['username'].widget.attrs['readonly'] = True
+            self.fields['peer_groups'].initial = self.instance.useracl.peer_groups.all()
+        else:
+            self.fields['password1'].required = True
+            self.fields['password2'].required = True
+
+        self.helper = FormHelper()
+        self.helper.form_method = 'post'
+        
+        if self.instance:
+            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('username', css_class='form-group col-md-12 mb-0'),
+                css_class='form-row'
+            ),
+            Row(
+                Column('password1', css_class='form-group col-md-12 mb-0'),
+                css_class='form-row'
+            ),
+            Row(
+                Column('password2', css_class='form-group col-md-12 mb-0'),
+                css_class='form-row'
+            ),
+            Row(
+                Column('user_level', css_class='form-group col-md-12 mb-0'),
+                css_class='form-row'
+            ),
+            Row(
+                Column('peer_groups', 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/list/">Back</a> '),
+                    HTML(delete_html),
+                    css_class='col-md-12'),
+                css_class='form-row'
+            )
+        )
 
     def clean_username(self):
         username = self.cleaned_data.get('username')
@@ -29,23 +76,51 @@ class UserAclForm(UserCreationForm):
             raise ValidationError("A user with that username already exists.")
         return username
 
-    def save(self, commit=True):
-        user = super().save(commit=False)
-        new_password = self.cleaned_data.get("password1")
-        
-        if new_password:
-            user.set_password(new_password)
-            user.save()
-        else:
-            if not user.id:
-                user.save()
+    def clean(self):
+        cleaned_data = super().clean()
+        password1 = cleaned_data.get('password1')
+        password2 = cleaned_data.get('password2')
 
-        if commit:
-            user_acl, created = UserAcl.objects.update_or_create(
-                user=user, 
-                defaults={'user_level': self.cleaned_data.get('user_level')}
+        if not self.instance:  
+            if not password1:
+                raise ValidationError("Password is required for new users.")
+            if not password2:
+                raise ValidationError("Password confirmation is required for new users.")
+
+        if password1 or password2: 
+            if password1 != password2:
+                raise ValidationError("The two password fields didn't match.")
+            if len(password1) < 8:
+                raise ValidationError("Password must be at least 8 characters long.")
+
+        return cleaned_data
+
+    def save(self):
+        username = self.cleaned_data['username']
+        password = self.cleaned_data.get('password1')
+        user_level = self.cleaned_data['user_level']
+        peer_groups = self.cleaned_data.get('peer_groups', [])
+
+        if self.instance:
+            user = self.instance
+            if password:
+                user.set_password(password)
+                user.save()
+        else:
+            user = User.objects.create_user(
+                username=username,
+                password=password
             )
 
+        user_acl, created = UserAcl.objects.update_or_create(
+            user=user,
+            defaults={
+                'user_level': user_level
+            }
+        )
+        
+        user_acl.peer_groups.set(peer_groups)
+
         return user