Merge pull request #41 from renderbox/TC-1052-qa-admin-panel-creating-new-roll-causes-error-

Adds site attribute to PermafrostRoleCreateForm

Author: devo-wm

permafrost/__version__.py

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

permafrost/forms.py

@@ -1,6 +1,7 @@
 # Permafrost Forms
 from django.conf import settings
 from django.contrib.auth.models import Permission
+from django.contrib.sites.models import Site
 from django.core.exceptions import ValidationError
 from django.forms import ModelForm
 from django.forms.fields import CharField, ChoiceField, BooleanField
@@ -66,7 +67,7 @@ class Meta:
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-
+        self.site = kwargs.pop('site', Site.objects.get_current())
         self.fields['category'].choices = CHOICES
 
         category = self.initial.get(
@@ -86,6 +87,7 @@ def __init__(self, *args, **kwargs):
         bootstrappify(self.fields)
 
     def save(self, commit=True):
+        self.instance.site = self.site
         instance = super().save(commit)        
         category = instance.category
 
@@ -109,7 +111,7 @@ def clean_name(self):
                 name_exists = PermafrostRole.objects.filter(
 
                     name=name, 
-                    site__id=settings.SITE_ID,
+                    site=self.site,
 
                 ).exclude(pk=self.instance.pk).first()
 
@@ -118,7 +120,7 @@ def clean_name(self):
             try:
                 name_exists = PermafrostRole.objects.get(
                     name=name, 
-                    site__id=settings.SITE_ID
+                    site=self.site
                 )
             except PermafrostRole.DoesNotExist:
                 pass

permafrost/views.py

@@ -156,7 +156,12 @@ def post(self, request, *args, **kwargs):
             submitted = SelectPermafrostRoleTypeForm(request.POST)
             permission_categories = {}
             if submitted.is_valid():
-                form = PermafrostRoleCreateForm(initial=submitted.cleaned_data)
+                
+                kwargs = {'initial': submitted.cleaned_data}
+                if hasattr(request, 'site'):
+                    kwargs['site'] = request.site
+                
+                form = PermafrostRoleCreateForm(**kwargs)
                 category = submitted.cleaned_data["category"]
                 required = get_required_by_category(category=category)
                 optional = get_optional_by_category(category=category)