Merge pull request #43 from renderbox/TC-1096-roles-and-permissions-saving-a-permafrost-role-in

TC-1096-roles-and-permissions-saving-a-permafrost-role-in

Author: devo-wm

permafrost/__version__.py

@@ -1 +1 @@
-VERSION = "0.2.14"
+VERSION = "0.2.15"

permafrost/forms.py

@@ -66,8 +66,8 @@ class Meta:
         labels = LABELS
 
     def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
         self.site = kwargs.pop('site', Site.objects.get_current())
+        super().__init__(*args, **kwargs)
         self.fields['category'].choices = CHOICES
 
         category = self.initial.get(

permafrost/tests.py

@@ -298,9 +298,10 @@ class PermafrostViewTests(TestCase):
 
     def setUp(self):
         self.client = Client()
-        self.pf_role = PermafrostRole.objects.create(category="staff", name="Test Role")
-        super_user = get_user_model().objects.get(pk=1)
-        self.client.force_login(super_user)
+        self.pf_role = PermafrostRole.objects.create(category="staff", name="Test Role", site=Site.objects.get_current())
+        PermafrostRole.objects.create(category="staff", name="Test Role", site=Site.objects.get(pk=2))
+        self.super_user = get_user_model().objects.get(pk=1)
+        self.client.force_login(self.super_user)
 
     def test_permafrost_base_url_resolves(self):
         found = resolve("/permafrost/")
@@ -505,6 +506,19 @@ def test_role_update_POST_updates_name(self):
         updated_role = PermafrostRole.objects.get(pk=self.pf_role.pk)
         self.assertEqual(updated_role.name, "Test Change")
 
+    def test_role_update_POST_updates_when_no_values_are_changed(self):
+        uri = reverse('permafrost:role-update', kwargs={'slug': 'test-role'})
+       
+        request = RequestFactory().post(uri, data={'name': 'Test Role'}, follow=True)
+
+        request.user = self.super_user
+        request.site = Site.objects.get(pk=2)
+        response = PermafrostRoleUpdateView.as_view()(request, slug='test-role')
+        response.client = self.client
+        self.assertRedirects(response, '/permafrost/role/test-role/')
+        updated_role = PermafrostRole.objects.get(pk=self.pf_role.pk)
+
+    
     def test_optional_permissions_are_updated_on_POST(self):
         ## ensure role currently has no optional permissions
         allowed_optional_permission_ids =[permission.id for permission in self.pf_role.optional_permissions()]
@@ -553,7 +567,6 @@ def test_optional_permissions_are_removed_when_empty_array_submitted_to_POST(sel
         response = self.client.post(uri, data=data, follow=True)
 
         updated_permission_ids = [permission.id for permission in self.pf_role.permissions().all() if permission.id in allowed_optional_permission_ids]
-        
         try:
             self.assertEqual(updated_permission_ids, [])
         except:
@@ -571,11 +584,11 @@ def test_delete_role_POST(self):
         response = self.client.post(uri, data=data, follow=True)
 
         try:
-            updated_role = PermafrostRole.objects.get(slug=self.pf_role.slug)
+            updated_role = PermafrostRole.objects.get(slug=self.pf_role.slug, site__id=1)
             self.assertEqual(updated_role.deleted, True)
         except:
             print("")
-            print(model_to_dict(PermafrostRole.objects.get(slug=self.pf_role.slug)))
+            print(model_to_dict(PermafrostRole.objects.get(slug=self.pf_role.slug, site__id=1)))
             print("")
             raise
 

permafrost/views.py

@@ -184,6 +184,12 @@ def get_form_class(self):
             return SelectPermafrostRoleTypeForm
         return PermafrostRoleCreateForm
 
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        if self.get_form_class() == PermafrostRoleCreateForm:
+            if hasattr(self.request, 'site'):
+                kwargs['site'] = self.request.site
+        return kwargs
 
 # List Permission Groups
 class PermafrostRoleListView(PermafrostSiteMixin, FilterByRequestSiteQuerysetMixin, ListView):
@@ -261,6 +267,11 @@ def get_context_data(self, **kwargs):
         )
         return context
 
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        if hasattr(self.request, 'site'):
+            kwargs['site'] = self.request.site
+        return kwargs
 
 # Delete Permission Groups
 class PermafrostRoleDeleteView(DeleteView):