Updated version.

Update French localization

admin_interface/admin.py

@@ -10,6 +10,8 @@ class ThemeAdmin(admin.ModelAdmin):
 
     list_display = ('name', 'active', )
     list_editable = ('active', )
+    list_per_page = 100
+    show_full_result_count = False
 
     fieldsets = (
         (None, {

admin_interface/cache.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+from django.conf import settings
+from django.core.cache import cache, caches
+
+
+def app_cache():
+    return caches['admin_interface'] if 'admin_interface' in settings.CACHES else cache
+
+
+def del_cached_active_theme():
+    app_cache().delete('admin_interface_theme')
+
+
+def get_cached_active_theme():
+    return app_cache().get('admin_interface_theme', None)
+
+
+def set_cached_active_theme(theme):
+    app_cache().set('admin_interface_theme', theme)

admin_interface/locale/fr/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-20 16:12+0000\n"
+"POT-Creation-Date: 2019-03-20 14:12-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,11 +58,11 @@ msgstr "Boutons supprimer"
 msgid "Related Modal"
 msgstr "Modale pour objet reliés"
 
-#: admin_interface/admin.py:99
+#: admin_interface/admin.py:100
 msgid "List Filter"
 msgstr "Filtre de liste"
 
-#: admin_interface/admin.py:103
+#: admin_interface/admin.py:104
 msgid "Recent Actions"
 msgstr "Actions récentes"
 
@@ -90,10 +90,8 @@ msgstr "titre"
 
 #: admin_interface/models.py:71 admin_interface/models.py:86
 #: admin_interface/models.py:106
-#, fuzzy
-#| msgid "logo color"
 msgid "color"
-msgstr "couleur du logo"
+msgstr "couleur"
 
 #: admin_interface/models.py:74 admin_interface/models.py:89
 #: admin_interface/models.py:260
@@ -121,14 +119,16 @@ msgid ""
 "(red: #E74C3C, orange: #E67E22, yellow: #F1C40F, green: #2ECC71, blue: "
 "#3498DB)"
 msgstr ""
+"(rouge: #E74C3C, orange: #E67E22, jaune: #F1C40F, vert: #2ECC71, bleu: "
+"#3498DB)"
 
 #: admin_interface/models.py:109
 msgid "visible in header (marker and name)"
-msgstr ""
+msgstr "visible dans l’en-tête (marqueur et nom)"
 
 #: admin_interface/models.py:112
 msgid "visible in favicon (marker)"
-msgstr ""
+msgstr "visible dans la favicon (marqueur)"
 
 #: admin_interface/models.py:119 admin_interface/models.py:144
 #: admin_interface/models.py:185 admin_interface/models.py:204
@@ -166,7 +166,7 @@ msgstr "opacité de l'arrière-plan"
 
 #: admin_interface/models.py:253
 msgid "close button visible"
-msgstr ""
+msgstr "bouton fermer visible"
 
 #: admin_interface/models.py:257
 msgid "use dropdown"

admin_interface/locale/it/LC_MESSAGES/django.po

@@ -69,7 +69,7 @@ msgstr "Azioni recenti"
 
 #: admin_interface/apps.py:11
 msgid "Admin Interface"
-msgstr "Interfaccia di admin"
+msgstr "Interfaccia di amministrazione"
 
 #: admin_interface/models.py:56 admin_interface/models.py:100
 msgid "name"

admin_interface/migrations/0014_name_unique.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0013_add_related_modal_close_button'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='theme',
+            name='name',
+            field=models.CharField(default='Django', max_length=50, unique=True, verbose_name='name'),
+        ),
+    ]

admin_interface/models.py

@@ -3,30 +3,45 @@
 from __future__ import unicode_literals
 
 from django.db import models
-from django.db.models.signals import post_delete, post_save
+from django.db.models.signals import post_delete, post_save, pre_save
 from django.utils.encoding import python_2_unicode_compatible, force_text
 from django.utils.translation import ugettext_lazy as _
 
 from colorfield.fields import ColorField
 
+from admin_interface.cache import del_cached_active_theme
+
 
 @python_2_unicode_compatible
 class Theme(models.Model):
 
     @staticmethod
     def post_migrate_handler(**kwargs):
+        del_cached_active_theme()
         Theme.get_active_theme()
 
     @staticmethod
     def post_delete_handler(**kwargs):
+        del_cached_active_theme()
         Theme.get_active_theme()
 
     @staticmethod
     def post_save_handler(instance, **kwargs):
+        del_cached_active_theme()
         if instance.active:
             Theme.objects.exclude(pk=instance.pk).update(active=False)
         Theme.get_active_theme()
 
+    @staticmethod
+    def pre_save_handler(instance, **kwargs):
+        if instance.pk is None:
+            try:
+                obj = Theme.objects.get(name=instance.name)
+                if obj:
+                    instance.pk = obj.pk
+            except Theme.DoesNotExist:
+                pass
+
     @staticmethod
     def get_active_theme():
         objs_manager = Theme.objects
@@ -51,6 +66,7 @@ class Theme(models.Model):
         return obj
 
     name = models.CharField(
+        unique=True,
         max_length=50,
         default='Django',
         verbose_name=_('name'))
@@ -275,3 +291,4 @@ class Theme(models.Model):
 
 post_delete.connect(Theme.post_delete_handler, sender=Theme)
 post_save.connect(Theme.post_save_handler, sender=Theme)
+pre_save.connect(Theme.pre_save_handler, sender=Theme)

admin_interface/static/admin_interface/related-modal/related-modal.js

@@ -78,12 +78,10 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
                 }
 
                 // build the iframe html
-                var iframeHTML = '<div class="related-modal-iframe-container">' +
+                var iframeHTML = '<iframe id="related-modal-iframe" name="' + iframeName + '" src="' + iframeSrc + '"></iframe>';
-                                    '<iframe id="related-modal-iframe" name="' + iframeName + '" src="' + iframeSrc + '"></iframe>' +
+                var modalHTML = '<div class="related-modal-iframe-container">' + iframeHTML + '</div>';
-                                '</div>';
+                var modalEl = $(modalHTML);
-
+                var iframeEl = modalEl.find('#related-modal-iframe');
-                // create the iframe jquery element
-                var iframeEl = $(iframeHTML);
 
                 if (e.data.lookup === true)
                 {
@@ -111,7 +109,7 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
                     showCloseBtn: true,
                     closeBtnInside: true,
                     items: {
-                        src: iframeEl,
+                        src: modalEl,
                         type: 'inline'
                     }
                 });
@@ -120,17 +118,31 @@ if (typeof(django) !== 'undefined' && typeof(django.jQuery) !== 'undefined')
             }
 
             // listen click events on related links
+            function presentRelatedObjectModalOnClickOn(selector, lookup) {
+                var data = {
+                    lookup:(lookup === true ? true : false)
+                };
+                var el = $(selector);
+                el.removeAttr('onclick');
+                el.unbind('click');
+                el.click(data, presentRelatedObjectModal);
+            }
 
             // django 1.7 compatibility
-            $('a.add-another').removeAttr('onclick');
+            // $('a.add-another').removeAttr('onclick').click({ lookup:false }, presentRelatedObjectModal);
-            $('a.add-another').click({ lookup:false }, presentRelatedObjectModal);
+            presentRelatedObjectModalOnClickOn('a.add-another');
 
             // django 1.8 and above
-            $('a.related-widget-wrapper-link').click({ lookup:false }, presentRelatedObjectModal);
+            // $('a.related-widget-wrapper-link').click({ lookup:false }, presentRelatedObjectModal);
+            presentRelatedObjectModalOnClickOn('a.related-widget-wrapper-link');
 
             // raw_id_fields support
-            $('a.related-lookup').unbind('click');
+            // $('a.related-lookup').unbind('click').click({ lookup:true }, presentRelatedObjectModal);
-            $('a.related-lookup').click({ lookup:true }, presentRelatedObjectModal);
+            presentRelatedObjectModalOnClickOn('a.related-lookup', true);
+
+            // django-dynamic-raw-id support - #61
+            // https://github.com/lincolnloop/django-dynamic-raw-id
+            presentRelatedObjectModalOnClickOn('a.dynamic_raw_id-related-lookup', true);
         });
 
     })(django.jQuery);

admin_interface/templates/admin/base_site.html

@@ -64,5 +64,5 @@ https://github.com/fabiocaccamo/django-admin-interface
 
 {% block welcome-msg %}
 {% get_admin_interface_theme as theme %}
-{% if theme.env_visible_in_header %}<span class="enviroment-label {{ theme.env_name }}"></span> - {% endif %}{{ block.super }}<br>
+{% if theme.env_visible_in_header %}<span class="environment-label {{ theme.env_name }}"></span> - {% endif %}{{ block.super }}<br>
-{% endblock %}
+{% endblock %}

admin_interface/templates/admin_interface/css/admin-interface.css

@@ -3,10 +3,10 @@
     color: {{ theme.css_header_text_color }};
 }
 
-.admin-interface .enviroment-label {
+.admin-interface .environment-label {
 }
 
-.admin-interface .enviroment-label::before {
+.admin-interface .environment-label::before {
     content: "";
     display: inline-block;
     width: 8px;
@@ -19,7 +19,7 @@
     -webkit-box-sizing: border-box;
 }
 
-.admin-interface .enviroment-label::after {
+.admin-interface .environment-label::after {
     content: "{{ theme.env_name }}";
 }
 
@@ -254,4 +254,4 @@
     {% if theme.css_module_rounded_corners %}
     border-radius:4px;
     {% endif %}
-}
+}

admin_interface/templatetags/admin_interface_tags.py

@@ -2,6 +2,7 @@
 
 from django import template, VERSION
 
+from admin_interface.cache import get_cached_active_theme, set_cached_active_theme
 from admin_interface.models import Theme
 from admin_interface.version import __version__
 
@@ -15,18 +16,10 @@ else:
 
 @simple_tag(takes_context=True)
 def get_admin_interface_theme(context):
-    theme = None
+    theme = get_cached_active_theme()
-    request = context.get('request', None)
-
-    if request:
-        theme = getattr(request, 'admin_interface_theme', None)
-
     if not theme:
         theme = Theme.get_active_theme()
-
+        set_cached_active_theme(theme)
-    if request:
-        request.admin_interface_theme = theme
-
     return theme
 
 

admin_interface/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.10.0'
+__version__ = '0.10.4'

tests/test_fixtures.py

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+
+from django.core.management import call_command
+from django.test import TestCase
+
+from admin_interface.models import Theme
+
+
+class AdminInterfaceFixturesTestCase(TestCase):
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def __load_theme(self, theme_name):
+        call_command('loaddata', 'admin_interface_theme_%s.json' % (theme_name, ))
+
+    def test_import_all(self):
+        self.__load_theme('django')
+        self.__load_theme('bootstrap')
+        self.__load_theme('foundation')
+        self.__load_theme('uswds')
+        self.assertEqual(Theme.objects.count(), 4);
+
+    def test_import_idempotency(self):
+        self.__load_theme('django')
+        self.__load_theme('django')
+        self.__load_theme('django')
+        self.__load_theme('django')
+        self.__load_theme('django')
+        self.assertEqual(Theme.objects.count(), 1);
+        self.__load_theme('bootstrap')
+        self.__load_theme('bootstrap')
+        self.__load_theme('bootstrap')
+        self.assertEqual(Theme.objects.count(), 2);
+
+    def test_import_override(self):
+        obj1 = Theme.get_active_theme()
+        obj1.title = 'Custom 1'
+        obj1.save()
+        self.__load_theme('django')
+        obj2 = Theme.get_active_theme()
+        self.assertEqual(obj1.pk, obj2.pk)
+        self.assertTrue(obj1.title != obj2.title)