Browse Source

Point out errors in perms forms

Rafał Pitoń 10 years ago
parent
commit
ca3dca3797

+ 2 - 0
misago/acl/views.py

@@ -49,6 +49,8 @@ class RoleFormMixin(object):
                     return redirect(request.path)
                     return redirect(request.path)
                 else:
                 else:
                     return redirect(self.root_link)
                     return redirect(self.root_link)
+            elif form.is_valid() and len(perms_forms) != valid_forms:
+                form.add_error(None, _("Form contains errors."))
 
 
         return self.render(
         return self.render(
             request,
             request,

+ 2 - 0
misago/forums/views/permsadmin.py

@@ -54,6 +54,8 @@ class RoleFormMixin(object):
                     return redirect(request.path)
                     return redirect(request.path)
                 else:
                 else:
                     return redirect(self.root_link)
                     return redirect(self.root_link)
+            elif form.is_valid() and len(perms_forms) != valid_forms:
+                form.add_error(None, _("Form contains errors."))
 
 
         return self.render(
         return self.render(
             request,
             request,

+ 5 - 2
misago/templates/misago/admin/permissions_table.html

@@ -4,15 +4,18 @@
 
 
   <table class="table table-striped table-permissions">
   <table class="table table-striped table-permissions">
     {% for field in form %}
     {% for field in form %}
-    <tr>
+    <tr{% if field.errors %} class="text-danger"{% endif %}>
       <td class="col-md-8">
       <td class="col-md-8">
         <label>{{ field.label }}:</label>
         <label>{{ field.label }}:</label>
+        {% for error in field.errors %}
+        <p class="small"><strong>{{ error }}</strong></p>
+        {% endfor %}
         {% if field.help_text %}
         {% if field.help_text %}
         <p class="text-muted small">{{ field.help_text }}</p>
         <p class="text-muted small">{{ field.help_text }}</p>
         {% endif %}
         {% endif %}
       </td>
       </td>
       <td>
       <td>
-        <div class="form-group">
+        <div class="form-group{% if field.errors %} has-error{% endif %}">
           {% if field|is_checkboxselectmultiple %}
           {% if field|is_checkboxselectmultiple %}
             {% include 'bootstrap3/layout/checkboxselectmultiple.html' %}
             {% include 'bootstrap3/layout/checkboxselectmultiple.html' %}
           {% endif %}
           {% endif %}