Merge pull request #19 from renderbox/develop

Prep for release v0.2.7

Author: devo-wm

permafrost/__version__.py

@@ -1 +1 @@
-VERSION = "0.2.6"
+VERSION = "0.2.7"

permafrost/forms.py

@@ -1,5 +1,7 @@
 # Permafrost Forms
+from django.conf import settings
 from django.contrib.auth.models import Permission
+from django.core.exceptions import ValidationError
 from django.forms import ModelForm, MultipleChoiceField, CheckboxSelectMultiple
 from django.forms.fields import CharField, ChoiceField, BooleanField
 from django.forms.widgets import CheckboxInput, Textarea
@@ -8,6 +10,11 @@
 
 CHOICES = [('', _("Choose Role Type"))] + get_choices()
 
+LABELS = {
+    'name': _('Role Name'),
+    'category': _('Role Type')
+}
+
 def assemble_optiongroups_for_widget(permissions):
     choices = []
     optgroups = {}
@@ -40,6 +47,7 @@ class SelectPermafrostRoleTypeForm(ModelForm):
     class Meta:
         model = PermafrostRole
         fields = ('name', 'description', 'category',)
+        labels = LABELS
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -55,24 +63,27 @@ class Meta:
         widgets = {
             'description': Textarea(),
         }
+        labels = LABELS
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         self.fields['category'].choices = CHOICES
-        category = self.initial.get('category', None)
+        category = self.initial.get(
+            'category', 
+            self.data.get('category', None)
+        )
 
         bootstrappify(self.fields)
 
         if category:  
-              
+
             required_perms = get_required_by_category(category)
             optional_perms = get_optional_by_category(category)
             required_choices = assemble_optiongroups_for_widget(required_perms)
             optional_choices = assemble_optiongroups_for_widget(optional_perms)
 
             initial = [perm.pk for perm in required_perms]
-            
             self.fields[f'optional_{category}_perms'] = MultipleChoiceField(label=_("Optional Permissions"), choices=optional_choices, widget=CheckboxSelectMultiple(), required=False)
             self.fields[f'required_{category}_perms'] = MultipleChoiceField(label=_("Required Permissions"), initial=initial, choices=required_choices, widget=CheckboxSelectMultiple(attrs={'readonly':True, 'disabled': True}), required=False)
 
@@ -89,13 +100,42 @@ def save(self, commit=True):
                 instance.permissions_clear()
         return instance
 
+    def clean_name(self):
+        name = self.cleaned_data['name']
+        name_exists = False
+       
+        if self.instance:  ## on update check if name change exists
+
+            if 'name' in self.changed_data:
+                name_exists = PermafrostRole.objects.filter(
+
+                    name=name, 
+                    site__id=settings.SITE_ID,
+
+                ).exclude(pk=self.instance.pk).first()
+            
+        else:
+
+            try:
+                name_exists = PermafrostRole.objects.get(
+                    name=name, 
+                    site__id=settings.SITE_ID
+                )
+            except PermafrostRole.DoesNotExist:
+                pass
+        
+        if name_exists:
+            raise ValidationError('Role with this name already exists')
+
+        # Always return field
+        return name
+
 class PermafrostRoleUpdateForm(PermafrostRoleCreateForm):
     """
      Form used to display role detail
      Only allowed to edit optional permissions, name and description
      Category and required permissions stay locked
     """
-    category = ChoiceField(choices=CHOICES, required=False)
     deleted = BooleanField(required=False)
 
     def __init__(self, *args, **kwargs):

permafrost/models.py

@@ -14,6 +14,9 @@
 
 from jsonfield import JSONField     # Using this instead of the PSQL one for portability
 
+import logging
+logger = logging.getLogger(__name__)
+
 
 ###############
 # CHOICES
@@ -76,16 +79,28 @@
 def get_current_site(*args, **kwargs):
     return settings.SITE_ID
 
+def get_permission_objects(natural_keys_list):
+    permissions = []
+    for item in natural_keys_list:
+        try:
+            permission = Permission.objects.get_by_natural_key(*item['permission']) 
+            permissions.append(permission)
+        except:
+            logger.warn(f'Permission not found in PERMAFROST_CATEGORIES: {item["permission"]}')
+            pass
+
+    return permissions
+
 def get_required_by_category(category):
     if 'required' in CATEGORIES[category]:
-        return [Permission.objects.get_by_natural_key(*item['permission']) for item in CATEGORIES[category]['required']]
+        return get_permission_objects(CATEGORIES[category]['required'])
     return []
 
 def get_optional_by_category(category):
     if 'optional' in CATEGORIES[category]:
-        return [Permission.objects.get_by_natural_key(*item['permission']) for item in CATEGORIES[category]['optional']]
+        return get_permission_objects(CATEGORIES[category]['optional'])
     return []
-
+    
 ###############
 # MANAGERS
 ###############

permafrost/templates/permafrost/permafrostrole_form.html

@@ -5,26 +5,31 @@
 {% block title %}{% if object %}{% trans 'Edit Role' %}{% else %}{% trans 'Create Role' %}{% endif %}{% endblock %}
 
 {% block content %}
+<form method="POST" id="role_form">
 <div class="d-sm-flex align-items-center justify-content-between mb-4">
-        <h1 class="h3 mb-0 text-gray-800"> 
-            {% if object %}
-            {% trans 'Edit Permissions' %}: {{ form.initial.name }}
-            {% else %}
-            {% trans 'Create Role' %}
-            {% endif %}
-        </h1>
+<h2> {% trans 'Roles & Permissions' %}</h2>
+<a href="{% if object %}{{ object.get_absolute_url }}{% else %}{% url 'permafrost:roles-manage' %}{% endif %}" class="btn btn-success btn-outline ml-auto">{% trans 'Cancel' %}</a>
+<button type="submit" class="btn btn-success ml-1">
+    {% if object %}
+        {% trans 'Save' %}                
+    {% else %}
+        {% trans 'Create' %}    
+    {% endif %}
+</button>
 </div>
-<form method="POST" id="role_form">
     {% csrf_token %}
     <div class="card">
+        <div class="card-header py-3 d-flex flex-row align-items-center justify-content-between">
+            <h6 class="m-0 text-primary font-weight-bold">
+                {% if object %}
+                {% trans 'Edit Permissions' %}: {{ form.initial.name }}
+                {% else %}
+                {% trans 'Create Role' %}
+                {% endif %}
+            </h6>
+        </div>
         <div class="card-body">
-            {% if form.subject.errors %}
-            <ol role="alertdialog">
-                {% for error in form.subject.errors %}
-                <li role="alert"><strong>{{ error|escape }}</strong></li>
-                {% endfor %}
-            </ol>
-            {% endif %}
+            {{ form.non_field_errors }}
             {% for field in form %}
                 <div class="fieldWrapper form-group" aria-required={% if field.field.required %}"true"{% else %}"false"{% endif %}>
                     {{ field.label_tag }}{% if field.field.required %}<span class="required">*</span>{% endif %}
@@ -34,18 +39,11 @@ <h1 class="h3 mb-0 text-gray-800">
                     {% if field.help_text %}
                     <p class="help">{{ field.help_text|safe }}</p>
                     {% endif %}
+                    {{ field.errors }}
                 </div>
             {% endfor %}
         </div>
         <div class="card-footer">
-            <a href="{% if object %}{{ object.get_absolute_url }}{% else %}{% url 'permafrost:roles-manage' %}{% endif %}" class="btn btn-primary">{% trans 'Cancel' %}</a>
-            <button type="submit" class="btn btn-success">
-                {% if object %}
-                    {% trans 'Save' %}                
-                {% else %}
-                    {% trans 'Create' %}    
-                {% endif %}
-            </button>
         </div>
     </div>
 </form>