Merge pull request #93 from glogiotatidis/admin_update

Admin update

snippets/base/admin.py

@@ -1,3 +1,4 @@
+import json
 import re
 
 from django.contrib import admin
@@ -52,6 +53,15 @@ def cmr_to_locales_action(modeladmin, request, queryset):
                                            'to Locale Rules')
 
 
+
+@transaction.commit_on_success
+def duplicate_snippets_action(modeladmin, request, queryset):
+    for snippet in queryset:
+        snippet.duplicate()
+duplicate_snippets_action.short_description = 'Duplicate selected snippets'
+
+
+
 class TemplateNameFilter(admin.AllValuesFieldListFilter):
     def __init__(self, *args, **kwargs):
         super(TemplateNameFilter, self).__init__(*args, **kwargs)
@@ -67,8 +77,10 @@ class BaseSnippetAdmin(BaseModelAdmin):
 
     list_display = (
         'name',
-        'priority',
+        'id',
         'disabled',
+        'text',
+        'locales',
         'publish_start',
         'publish_end',
         'modified',
@@ -84,7 +96,6 @@ class BaseSnippetAdmin(BaseModelAdmin):
     )
     list_editable = (
         'disabled',
-        'priority',
         'publish_start',
         'publish_end'
     )
@@ -94,6 +105,7 @@ class BaseSnippetAdmin(BaseModelAdmin):
     save_as = True
 
     filter_horizontal = ('client_match_rules',)
+    actions = (duplicate_snippets_action,)
 
     def save_model(self, request, obj, form, change):
         """Save locale changes as well as the snippet itself."""
@@ -113,6 +125,9 @@ def change_view(self, request, *args, **kwargs):
             request.POST['disabled'] = u'on'
         return super(BaseSnippetAdmin, self).change_view(request, *args, **kwargs)
 
+    def locales(self, obj):
+        return ', '.join([locale.get_locale_display() for locale in obj.locale_set.all()])
+
 
 class SnippetAdmin(BaseSnippetAdmin):
     form = forms.SnippetAdminForm
@@ -164,7 +179,7 @@ class SnippetAdmin(BaseSnippetAdmin):
         }),
     )
 
-    actions = (cmr_to_locales_action,)
+    actions = (cmr_to_locales_action, duplicate_snippets_action)
 
     class Media:
         css = {
@@ -176,6 +191,14 @@ def lookup_allowed(self, key, value):
             return True
         return super(SnippetAdmin, self).lookup_allowed(key, value)
 
+    def text(self, obj):
+        text = []
+        data = json.loads(obj.data)
+        text_keys = (obj.template.variable_set
+                        .filter(type=models.SnippetTemplateVariable.TEXT)
+                        .values_list('name', flat=True))
+        return '\n'.join([data[key] for key in text_keys if data[key]])
+
 
 class ClientMatchRuleAdmin(BaseModelAdmin):
     list_display = ('description', 'is_exclusion', 'startpage_version', 'name',

snippets/base/models.py

@@ -1,3 +1,4 @@
+import copy
 import hashlib
 import json
 import os
@@ -6,6 +7,7 @@
 import xml.sax
 from StringIO import StringIO
 from collections import namedtuple
+from datetime import datetime
 from urlparse import urljoin
 from xml.sax import ContentHandler
 
@@ -15,6 +17,7 @@
 from django.core.files.base import ContentFile
 from django.core.urlresolvers import reverse
 from django.db import models
+from django.db.models.manager import Manager
 from django.template.loader import render_to_string
 
 import jingo
@@ -156,6 +159,7 @@ def generate(self):
         cache.set(self.cache_key, True, settings.SNIPPET_BUNDLE_TIMEOUT)
 
 
+
 class SnippetTemplate(CachingMixin, models.Model):
     """
     A template for the body of a snippet. Can have multiple variables that the
@@ -258,7 +262,35 @@ def __unicode__(self):
         return self.description
 
 
-class Snippet(CachingMixin, models.Model):
+class SnippetBaseModel(models.Model):
+    def duplicate(self):
+        snippet_copy = copy.copy(self)
+        snippet_copy.id = None
+        snippet_copy.disabled = True
+        snippet_copy.name = '{0} - {1}'.format(
+            self.name,
+            datetime.strftime(datetime.now(), '%Y.%m.%d %H:%M:%S'))
+        snippet_copy.save()
+
+        for field in self._meta.get_all_field_names():
+            if isinstance(getattr(self, field), Manager):
+                manager = getattr(self, field)
+                if manager.__class__.__name__ == 'RelatedManager':
+                    for itm in manager.all():
+                        itm_copy = copy.copy(itm)
+                        itm_copy.id = None
+                        getattr(snippet_copy, field).add(itm_copy)
+                elif manager.__class__.__name__ == 'ManyRelatedManager':
+                    for snippet in manager.all():
+                        getattr(snippet_copy, field).add(snippet)
+
+        return snippet_copy
+
+    class Meta:
+        abstract = True
+
+
+class Snippet(CachingMixin, SnippetBaseModel):
     name = models.CharField(max_length=255, unique=True)
     template = models.ForeignKey(SnippetTemplate)
     data = models.TextField(default='{}', validators=[validate_xml])
@@ -359,7 +391,7 @@ class SnippetLocale(CachingMixin, models.Model):
     cached_objects = CachingManager()
 
 
-class JSONSnippet(CachingMixin, models.Model):
+class JSONSnippet(CachingMixin, SnippetBaseModel):
     name = models.CharField(max_length=255, unique=True)
     priority = models.IntegerField(default=0, blank=True)
     disabled = models.BooleanField(default=True)

snippets/base/tests/test_models.py

@@ -8,13 +8,32 @@
 
 from snippets.base.models import Client, SnippetBundle, UploadedFile, validate_xml
 from snippets.base.tests import (ClientMatchRuleFactory,
+                                 JSONSnippetFactory,
                                  SearchProviderFactory,
                                  SnippetFactory,
                                  SnippetTemplateFactory,
                                  SnippetTemplateVariableFactory,
                                  TestCase,
                                  UploadedFileFactory)
 
+class DuplicateSnippetMixInTests(TestCase):
+    def _dup_test(self, snippet):
+        snippet.client_match_rules.add(*ClientMatchRuleFactory.create_batch(3))
+        snippet_copy = snippet.duplicate()
+        eq_(snippet_copy.disabled, True)
+        ok_(snippet_copy.id != snippet.id)
+        eq_(snippet_copy.locale_set.count(), 1)
+        ok_(snippet_copy.locale_set.all()[0] != snippet.locale_set.all()[0])
+        eq_(set(snippet_copy.client_match_rules.all()), set(snippet.client_match_rules.all()))
+
+    def test_snippet(self):
+        snippet = SnippetFactory.create()
+        self._dup_test(snippet)
+
+    def test_json_snippet(self):
+        snippet = JSONSnippetFactory.create()
+        self._dup_test(snippet)
+
 
 class ClientMatchRuleTests(TestCase):
     def _client(self, **kwargs):