PR updates

Author: adam-murray

djangocms_snippet/admin.py

@@ -4,6 +4,7 @@
 from django.db import models
 from django.forms import Textarea
 
+from .cms_config import SnippetCMSAppConfig
 from .models import Snippet
 from .views import SnippetPreviewView
 
@@ -16,7 +17,18 @@
     djangocms_versioning_installed = False
 
 
-class AbstractSnippetAdmin(admin.ModelAdmin):
+djangocms_versioning_enabled = SnippetCMSAppConfig.djangocms_versioning_enabled
+
+snippet_admin_classes = [
+    admin.ModelAdmin,
+]
+
+
+if djangocms_versioning_installed and djangocms_versioning_enabled:
+    snippet_admin_classes = [ExtendedVersionAdminMixin] + snippet_admin_classes
+
+
+class SnippetAdmin(*snippet_admin_classes):
     list_display = ('slug', 'name')
     search_fields = ['slug', 'name']
     prepopulated_fields = {'slug': ('name',)}
@@ -31,25 +43,6 @@ class AbstractSnippetAdmin(admin.ModelAdmin):
     formfield_overrides = {
         models.TextField: {'widget': Textarea(attrs=text_area_attrs)}
     }
-
-    class Meta:
-        abstract = True
-
-
-djangocms_versioning_enabled = getattr(
-    settings, 'DJANGOCMS_SNIPPET_VERSIONING_ENABLED', False
-)
-
-snippet_admin_classes = [
-    AbstractSnippetAdmin,
-]
-
-
-if djangocms_versioning_installed and djangocms_versioning_enabled:
-    snippet_admin_classes = [ExtendedVersionAdminMixin] + snippet_admin_classes
-
-
-class SnippetAdmin(*snippet_admin_classes):
     class Meta:
         model = Snippet
 

djangocms_snippet/forms.py

@@ -1,7 +1,8 @@
 from django import forms
-from django.conf import settings
+from django.db import transaction
 from django.utils.translation import ugettext_lazy as _
 
+from djangocms_snippet.cms_config import SnippetCMSAppConfig
 from djangocms_snippet.models import Snippet, SnippetGrouper
 
 
@@ -11,9 +12,7 @@
 except ImportError:
     is_versioning_installed = False
 
-djangocms_versioning_enabled = getattr(
-        settings, 'DJANGOCMS_SNIPPET_VERSIONING_ENABLED', False
-    )
+djangocms_versioning_enabled = SnippetCMSAppConfig.djangocms_versioning_enabled
 
 
 class SnippetForm(forms.ModelForm):
@@ -35,13 +34,13 @@ def clean(self):
         name = data.get("name")
         slug = data.get("slug")
         snippet_grouper = data.get("snippet_grouper")
-        published_snippet_queryset = Snippet.objects.all()
+        snippet_queryset = Snippet.objects.all()
 
         if djangocms_versioning_enabled and is_versioning_installed:
             if snippet_grouper:
-                published_snippet_queryset.exclude(snippet_grouper=snippet_grouper)
+                snippet_queryset.exclude(snippet_grouper=snippet_grouper)
 
-        for snippet in published_snippet_queryset:
+        for snippet in snippet_queryset:
             if snippet.name == name:
                 self.add_error(
                     "name", _("A Snippet with this name already exists")
@@ -53,6 +52,7 @@ def clean(self):
 
         return data
 
+    @transaction.atomic
     def save(self, **kwargs):
         if not self.cleaned_data.get("snippet_grouper"):
             super().save(commit=False)

djangocms_snippet/urls.py

@@ -6,6 +6,7 @@
 from cms.test_utils.testcases import CMSTestCase
 
 from djangocms_snippet import admin as snippet_admin
+from djangocms_snippet import cms_config
 from djangocms_snippet.models import Snippet
 
 from .utils.factories import SnippetWithVersionFactory
@@ -23,12 +24,13 @@ def test_admin_list_display_without_versioning(self):
         Without versioning enabled, list_display should not be extended with version related items
         """
         admin.site.unregister(Snippet)
+        reload(cms_config)
         reload(snippet_admin)
         self.snippet_admin = snippet_admin.SnippetAdmin(Snippet, admin)
 
         list_display = self.snippet_admin.get_list_display(self.snippet_admin_request)
 
-        self.assertEqual(self.snippet_admin.__class__.__bases__, (snippet_admin.AbstractSnippetAdmin,))
+        self.assertEqual(self.snippet_admin.__class__.__bases__, (admin.ModelAdmin, ))
         self.assertEqual(list_display, ('slug', 'name'))
 
     def test_admin_list_display_with_versioning(self):
@@ -40,7 +42,7 @@ def test_admin_list_display_with_versioning(self):
         list_display = self.snippet_admin.get_list_display(self.snippet_admin_request)
 
         self.assertEqual(
-            self.snippet_admin.__class__.__bases__, (ExtendedVersionAdminMixin, snippet_admin.AbstractSnippetAdmin)
+            self.snippet_admin.__class__.__bases__, (ExtendedVersionAdminMixin, admin.ModelAdmin)
         )
         self.assertEqual(
             list_display[:-1], ('slug', 'name', 'get_author', 'get_modified_date', 'get_versioning_state')