Merge pull request #59 from renderbox/develop

Release v0.2.19

Author: mgcamisa

permafrost/__version__.py

@@ -1 +1 @@
-VERSION = "0.2.18"
+VERSION = "0.2.19"

permafrost/templates/permafrost/permafrostrole_form.html

@@ -132,16 +132,17 @@ <h6 class="m-0 text-primary font-weight-bold">
                     <div class="col-6">
                         {% for permission in category.optional %}
                         <div class="d-flex align-items-center">
-                            <span>{{ permission.name }}</span>
-                            
+                            <label for="permission-{{ permission.id }}">{{ permission.name }}</label>
+
                             {% if permission.short_description %}
                             <i class="ml-2 fas fa-info-circle text-gray-600" aria-label="{% trans 'Info' %}"></i>
                             {% endif %}
-                            <input 
-                                class="ml-auto" 
-                                type="checkbox" 
-                                name="{{ form.permissions.name }}" 
+                            <input
+                                class="ml-auto"
+                                type="checkbox"
+                                name="{{ form.permissions.name }}"
                                 value="{{ permission.id }}"
+                                id="permission-{{ permission.id }}"
                                 {% if permission.selected %} checked{% endif %}
                             >
                         </div>
@@ -170,5 +171,4 @@ <h6 class="m-0 text-primary font-weight-bold">
         })
     </script>
     {% endif %}
-{% endblock %}
-    
+{% endblock %}

permafrost/tests.py

@@ -469,20 +469,20 @@ def test_update_form_has_selected_optional_permission(self):
         uri = reverse('permafrost:role-update', kwargs={'slug': 'test-role'})
         response = self.client.get(uri)
         try:
-            self.assertContains(response, """<input 
-                                class="ml-auto" 
-                                type="checkbox" 
-                                name="permissions" 
-                                value="37"
-                                 checked
-                            >""")
-            self.assertContains(response, """<input 
-                                class="ml-auto" 
-                                type="checkbox" 
-                                name="permissions" 
-                                value="38"
-                                 checked
-                            >""")
+            self.assertTrue(response.context['permission_categories']['permafrostrole']['optional'][0].selected)
+            self.assertTrue(response.context['permission_categories']['permafrostrole']['optional'][1].selected)
+            self.assertEqual(response.context['permission_categories']['permafrostrole']['optional'][0].id, 37)
+            self.assertEqual(response.context['permission_categories']['permafrostrole']['optional'][1].id, 38)
+            self.assertEqual(response.context['permission_categories']['permafrostrole']['optional'][0].name,
+                             'Can add Role')
+            self.assertEqual(response.context['permission_categories']['permafrostrole']['optional'][1].name,
+                             'Can change Role')
+            self.assertContains(response, 'value="37"')
+            self.assertContains(response, 'value="38"')
+            self.assertContains(response, 'id="permission-37"')
+            self.assertContains(response, 'id="permission-38"')
+            self.assertContains(response, 'checked')
+
         except:
             print("")
             print(response.content.decode())