fix Add(Extension/Theme)AccessForm

numbas · Jun 22, 2022 · 5107fab · 5107fab
1 parent c46a10e
commit 5107fab
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/editor/forms.py b/editor/forms.py
@@ -455,9 +455,9 @@ class Meta:
 
     def check_author_access(self, cleaned_data):
         user = cleaned_data.get('user_search')
-        extension = Extension.objects.get(pk=cleaned_data.get('object_id'))
-        if user == extension.author:
-            raise forms.ValidationError("Can't give separate access to the extension's author")
+        package = self.package.objects.get(pk=cleaned_data.get('object_id'))
+        if user == package.author:
+            raise forms.ValidationError("Can't give separate access to the {}'s author".format(self.package.package_noun))
 
     def clean(self):
         cleaned_data = super().clean()
@@ -476,6 +476,12 @@ def save(self, force_insert=False, force_update=False, commit=True):
                 m.save()
         return m
 
+class AddExtensionAccessForm(AddEditablePackageAccessForm):
+    package = Extension
+
+class AddThemeAccessForm(AddEditablePackageAccessForm):
+    package = Theme
+
 class EditThemeForm(EditPackageForm):
     class Meta(EditPackageForm.Meta):
         model = Theme

diff --git a/editor/views/extension.py b/editor/views/extension.py
@@ -70,11 +70,11 @@ class DeleteFileView(ExtensionViewMixin,editable_package.DeleteFileView):
 class AccessView(ExtensionViewMixin,editable_package.AccessView):
     model = Extension
     form_class = forms.IndividualAccessFormset
-    single_form_class = forms.AddEditablePackageAccessForm
+    single_form_class = forms.AddExtensionAccessForm
     success_view = 'extension_access'
 
 class AddAccessView(ExtensionViewMixin,editable_package.AddAccessView):
-    form_class = forms.AddEditablePackageAccessForm
+    form_class = forms.AddExtensionAccessForm
 
     def get_package(self):
         return Extension.objects.get(pk=self.kwargs['extension_pk'])

diff --git a/editor/views/theme.py b/editor/views/theme.py
@@ -125,11 +125,11 @@ class DeleteFileView(ThemeViewMixin,editable_package.DeleteFileView):
 class AccessView(ThemeViewMixin,editable_package.AccessView):
     model = Theme
     form_class = forms.IndividualAccessFormset
-    single_form_class = forms.AddEditablePackageAccessForm
+    single_form_class = forms.AddThemeAccessForm
     success_view = 'theme_access'
 
 class AddAccessView(ThemeViewMixin,editable_package.AddAccessView):
-    form_class = forms.AddEditablePackageAccessForm
+    form_class = forms.AddThemeAccessForm
 
     def get_package(self):
         return Theme.objects.get(pk=self.kwargs['theme_pk'])