typho

Fixes #2

.github/workflows/test-package.yml

@@ -6,12 +6,37 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+
+  prepare:
+    
+    runs-on: ubuntu-latest  
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      
+      - name: Create matrix
+        uses: fabiocaccamo/create-matrix-action@v2
+        id: create_matrix
+        with:
+          matrix: |
+            python-version {2.7}, django-version {1.8,1.9,1.10,1.11}, database {sqlite,postgres}
+            python-version {3.6}, django-version {1.8,1.9,1.10,1.11,2.0,2.1,2.2,3.0,3.1,3.2}, database {sqlite,postgres}
+            python-version {3.7}, django-version {2.0,2.1,2.2,3.0,3.1,3.2}, database {sqlite,postgres}
+            python-version {3.8}, django-version {2.2,3.0,3.1,3.2}, database {sqlite,postgres}
+            python-version {3.9}, django-version {2.2,3.0,3.1,3.2}, database {sqlite,postgres}
+            python-version {3.10}, django-version {3.2,4.0}, database {sqlite,postgres}
+     
+    outputs:
+      matrix: ${{ steps.create_matrix.outputs.matrix }}
+        
+  test:
+  
+    needs: prepare
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix: 
-        python-version: ['2.7', '3.6', '3.7', '3.8', '3.9', '3.10']
+        include: ${{fromJson(needs.prepare.outputs.matrix)}}
 
     services:
       postgres:
@@ -27,7 +52,10 @@ jobs:
 
     steps:
 
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
+
+    - name: Install psycopg2 prerequisites
+      run: sudo apt-get install libpq-dev
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
@@ -35,15 +63,31 @@ jobs:
         python-version: ${{ matrix.python-version }}
         cache: 'pip'
       
-    - name: Install psycopg2 prerequisites
-      run: sudo apt-get install libpq-dev
-
-    - name: Install dependencies
+    - name: Upgrade pip version
+      run: |
+        pip install pip --upgrade
+    
+    - name: Install django
+      run: |
+        pip install "Django ~= ${{ matrix.django-version }}"
+    
+    - name: Install requirements
       run: |
-        python -m pip install --upgrade pip
         pip install -r requirements.txt
         pip install -r requirements-test.txt
-        pip install tox tox-gh-actions
         
-    - name: Test with tox
-      run: tox
+    - name: Run tests
+      env: 
+        DATABASE_ENGINE: ${{ matrix.database }}
+      run: |
+        coverage run --append --source=admin_interface setup.py test
+        coverage xml -o ./coverage.xml
+    
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v2
+      with:
+        fail_ci_if_error: false
+        files: ./coverage.xml
+        flags: unittests
+        verbose: true
+        

CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.19.0](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.19.0) - 2022-03-08
+-  Converted dynamic inline CSS to external static CSS using CSS variables. #157 #93 (thanks to [@Mustafa-Abu-Ghazy](https://github.com/Mustafa-Abu-Ghazy))
+
 ## [0.18.7](https://github.com/fabiocaccamo/django-admin-interface/releases/tag/0.18.7) - 2022-02-24
 -  Removed public disclosures of the lib's version. #154 (thanks to [@mintyPT](https://github.com/mintyPT))
 -  Reformatted code with **Black**.

admin_interface/admin.py

@@ -1,16 +1,28 @@
 # -*- coding: utf-8 -*-
 
-from admin_interface.compat import gettext_lazy as _
-from admin_interface.models import Theme
-
 from django.contrib import admin
+from django.contrib.auth import models as auth_models
+
+from admin_interface.compat import gettext_lazy as _
+from admin_interface.models import Theme, UserTheme
+
+from .import_tema.admin import ImportMixin
 
 
-class ThemeAdmin(admin.ModelAdmin):
+class UserInline(admin.TabularInline):
+    model = UserTheme
+    extra = 0
+    autocomplete_fields = ('user', )
+
+
+class ThemeAdmin(ImportMixin, admin.ModelAdmin):
+    inlines = [UserInline, ]
 
     list_display = (
         "name",
         "active",
+        "demo",
+        "default",
     )
     list_editable = ("active",)
     list_per_page = 100
@@ -24,6 +36,8 @@ class ThemeAdmin(admin.ModelAdmin):
                 "fields": (
                     "name",
                     "active",
+                    "demo",
+                    "default",
                 ),
             },
         ),
@@ -133,7 +147,8 @@ class ThemeAdmin(admin.ModelAdmin):
                 ),
             },
         ),
-        (_("Navigation Bar"), {"classes": ("wide",), "fields": ("foldable_apps",)}),
+        (_("Navigation Bar"), {"classes": (
+            "wide",), "fields": ("foldable_apps",)}),
         (
             _("Related Modal"),
             {

admin_interface/context_processor.py

@@ -0,0 +1,43 @@
+from .models import Theme, UserTheme
+
+def get_active_theme(request):
+    objs_manager = Theme.objects
+    user_theme_manager = UserTheme.objects
+    objs_active_qs = objs_manager.filter(active=True)
+    objs_active_ls = list(objs_active_qs)
+    objs_active_count = len(objs_active_ls)
+
+    if objs_active_count == 0:
+        obj = objs_manager.first()
+        if obj:
+            obj.set_active()
+        # else:
+        #     obj = objs_manager.create()
+
+    elif objs_active_count == 1:
+        obj = objs_active_ls[0]
+
+    elif objs_active_count > 1:
+
+        # for frame_record in inspect.stack():
+        #     if frame_record[3]=='get_response':
+        #         request = frame_record[0].f_locals['request']
+        #         user = request.user
+        #         break
+        # else:
+        #     request = None
+        user = request.user
+        try:
+            obj = user_theme_manager.filter(user=user, theme__active=True).first().theme
+        except:
+            objs_default_qs = objs_active_qs.filter(default=True)
+            if len(objs_default_qs) == 0:
+                obj = objs_active_qs.first()
+                if obj:
+                    obj.set_default()
+            else:
+                obj = objs_default_qs.first()
+
+    return {
+            'theme': obj,
+            }

admin_interface/import_tema/admin.py

@@ -0,0 +1,160 @@
+import json
+import os
+import tempfile
+import zipfile
+
+import django
+from django import forms
+from django.conf import settings
+from django.contrib import admin, messages
+from django.contrib.auth import get_permission_codename
+from django.core.exceptions import PermissionDenied
+from django.core.files.storage import default_storage
+from django.http import HttpResponseRedirect
+from django.template.response import TemplateResponse
+from django.urls import path, reverse
+from django.utils.translation import gettext_lazy as _
+
+from .. import models
+from .forms import ImportForm
+
+
+class ImportMixin(admin.ModelAdmin):
+    """
+    Import mixin.
+
+    This is intended to be mixed with django.contrib.admin.ModelAdmin
+    https://docs.djangoproject.com/en/2.1/ref/contrib/admin/#modeladmin-objects
+    """
+
+    #: template for change_list view
+    change_list_template = 'admin/import_export/change_list_import.html'
+    #: template for import view
+    import_template_name = 'admin/import_export/import.html'
+
+    def get_model_info(self):
+        app_label = self.model._meta.app_label
+        return (self.model._meta.app_label, self.model._meta.model_name)
+
+    def has_import_permission(self, request):
+        """
+        Returns whether a request has import permission.
+        """
+        IMPORT_PERMISSION_CODE = getattr(settings, 'IMPORT_EXPORT_IMPORT_PERMISSION_CODE', None)
+        if IMPORT_PERMISSION_CODE is None:
+            return True
+
+        opts = self.opts
+        codename = get_permission_codename(IMPORT_PERMISSION_CODE, opts)
+        return request.user.has_perm("%s.%s" % (opts.app_label, codename))
+
+    def get_urls(self):
+        urls = super().get_urls()
+        info = self.get_model_info()
+        my_urls = [
+            path('import/',
+                self.admin_site.admin_view(self.import_action),
+                name='%s_%s_import' % info),
+        ]
+        return my_urls + urls
+
+    def get_import_context_data(self, **kwargs):
+        return self.get_context_data(**kwargs)
+
+    def get_context_data(self, **kwargs):
+        return {}
+
+    def get_form_kwargs(self, form, *args, **kwargs):
+        """
+        Prepare/returns kwargs for the import form.
+
+        To distinguish between import and confirm import forms,
+        the following approach may be used:
+
+            if isinstance(form, ImportForm):
+                # your code here for the import form kwargs
+                # e.g. update.kwargs({...})
+            elif isinstance(form, ConfirmImportForm):
+                # your code here for the confirm import form kwargs
+                # e.g. update.kwargs({...})
+            ...
+        """
+        return kwargs
+
+    def import_action(self, request, *args, **kwargs):
+        """
+        Perform a dry_run of the import to make sure the import will not
+        result in errors.  If there where no error, save the user
+        uploaded file to a local temp file that will be used by
+        'process_import' for the actual import.
+        """
+        if not self.has_import_permission(request):
+            raise PermissionDenied
+
+        context = self.get_import_context_data()
+
+        form_type = ImportForm
+        form_kwargs = self.get_form_kwargs(form_type, *args, **kwargs)
+        form = form_type(request.POST or None,
+                         request.FILES or None,
+                         **form_kwargs)
+
+        if request.POST and form.is_valid():
+            import_file_tema = form.cleaned_data['tema']
+            if zipfile.is_zipfile(import_file_tema):
+                with zipfile.ZipFile(import_file_tema, 'r') as zip_ref:
+                    with tempfile.TemporaryDirectory() as tempdir:
+                        zip_ref.extractall(tempdir)
+                        lst = os.listdir(tempdir)
+                        allowed_extensions=[".gif", ".jpg", ".jpeg", ".png", ".svg"]
+                        try:
+                            tema_json = [s for s in os.listdir(f'{tempdir}/{lst[0]}') if '.json' in s][0]
+                            logo = [s for s in os.listdir(f'{tempdir}/{lst[0]}/logo') if any(ele in s for ele in allowed_extensions)]
+                            logo = logo[0] if logo else None
+                            favicon = [s for s in os.listdir(f'{tempdir}/{lst[0]}/favicon') if any(ele in s for ele in allowed_extensions)]
+                            favicon = favicon[0] if favicon else None
+                            with open(f'{tempdir}/{lst[0]}/{tema_json}', 'r') as temporary_file:
+                                result = json.loads(temporary_file.read())
+                            if logo:
+                                with open(f'{tempdir}/{lst[0]}/logo/{logo}', 'rb') as temporary_file:
+                                    default_storage.save(f"admin-interface/logo/{temporary_file.name.split('/')[-1]}", temporary_file)
+                            if favicon:
+                                with open(f'{tempdir}/{lst[0]}/favicon/{favicon}', 'rb') as temporary_file:
+                                    default_storage.save(f"admin-interface/favicon/{temporary_file.name.split('/')[-1]}", temporary_file)
+                            skip_result = False
+                        except FileNotFoundError as e:
+                            messages.error(request, 'Struttura del file .zip errata.')
+                            skip_result = True
+                if not skip_result:
+                    try:
+                        new_theme = models.Theme(
+                            **result[0]['fields']
+                        )
+                        new_theme.save()
+                        
+                        messages.success(request, _('Import finished'))
+                    except:
+                        messages.error(request, 'Struttura del file .json errata.')
+            else:
+                messages.error(request, 'È richiesto un file .zip')
+            
+            url = reverse('admin:%s_%s_changelist' % self.get_model_info(),
+                        current_app=self.admin_site.name)
+            return HttpResponseRedirect(url)
+        else:
+            context.update(self.admin_site.each_context(request))
+
+            context['title'] = _("Import")
+            context['form'] = form
+            context['opts'] = self.model._meta
+
+            request.current_app = self.admin_site.name
+            return TemplateResponse(request, [self.import_template_name],
+                                    context)
+
+    def changelist_view(self, request, extra_context=None):
+        if extra_context is None:
+            extra_context = {}
+        extra_context['has_import_permission'] = self.has_import_permission(request)
+        return super().changelist_view(request, extra_context)
+

admin_interface/import_tema/forms.py

@@ -0,0 +1,11 @@
+import os.path
+
+from django import forms
+from django.contrib.admin.helpers import ActionForm
+from django.utils.translation import gettext_lazy as _
+
+
+class ImportForm(forms.Form):
+    tema = forms.FileField(
+        label='Zip'
+        )

admin_interface/import_tema/locale/it/LC_MESSAGES/django.po

@@ -0,0 +1,139 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Christian Galeffi <chri@gallochri.com>, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-04 09:27+0200\n"
+"PO-Revision-Date: 2015-08-30 20:32+0100\n"
+"Last-Translator: Christian Galeffi <chri@gallochri.com>\n"
+"Language-Team: Italian <kde-i18n-it@kde.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#: admin.py:194
+#, python-format
+msgid "%s through import_export"
+msgstr ""
+
+#: admin.py:200
+msgid "Import finished, with {} new and {} updated {}."
+msgstr ""
+
+#: admin.py:298
+#, python-format
+msgid "<h1>Imported file has a wrong encoding: %s</h1>"
+msgstr ""
+
+#: admin.py:300
+#, python-format
+msgid "<h1>%s encountered while trying to read file: %s</h1>"
+msgstr ""
+
+#: admin.py:331 templates/admin/import_export/change_list_import_item.html:5
+#: templates/admin/import_export/import.html:10
+msgid "Import"
+msgstr "Importare"
+
+#: admin.py:496 templates/admin/import_export/change_list_export_item.html:5
+#: templates/admin/import_export/export.html:7
+msgid "Export"
+msgstr "Esportare"
+
+#: admin.py:554
+msgid "You must select an export format."
+msgstr "Devi selezionare un formato di esportazione."
+
+#: admin.py:567
+#, python-format
+msgid "Export selected %(verbose_name_plural)s"
+msgstr "Esporta selezionati %(verbose_name_plural)s"
+
+#: forms.py:10
+msgid "File to import"
+msgstr "File da importare"
+
+#: forms.py:13 forms.py:41 forms.py:66
+msgid "Format"
+msgstr "Formato"
+
+#: templates/admin/import_export/base.html:11
+msgid "Home"
+msgstr "Home"
+
+#: templates/admin/import_export/export.html:31
+#: templates/admin/import_export/import.html:52
+msgid "Submit"
+msgstr "Inviare"
+
+#: templates/admin/import_export/import.html:20
+msgid ""
+"Below is a preview of data to be imported. If you are satisfied with the "
+"results, click 'Confirm import'"
+msgstr ""
+"Questa è un'anteprima dei dati che saranno importati. Se il risultato è "
+"soddisfacente, premi 'Conferma importazione'"
+
+#: templates/admin/import_export/import.html:23
+msgid "Confirm import"
+msgstr "Conferma importazione"
+
+#: templates/admin/import_export/import.html:31
+msgid "This importer will import the following fields: "
+msgstr "Verranno importati i seguenti campi:"
+
+#: templates/admin/import_export/import.html:61
+#: templates/admin/import_export/import.html:90
+msgid "Errors"
+msgstr "Errori"
+
+#: templates/admin/import_export/import.html:72
+msgid "Line number"
+msgstr "Numero linea"
+
+#: templates/admin/import_export/import.html:82
+msgid "Some rows failed to validate"
+msgstr ""
+
+#: templates/admin/import_export/import.html:84
+msgid ""
+"Please correct these errors in your data where possible, then reupload it "
+"using the form above."
+msgstr ""
+
+#: templates/admin/import_export/import.html:89
+msgid "Row"
+msgstr ""
+
+#: templates/admin/import_export/import.html:116
+msgid "Non field specific"
+msgstr ""
+
+#: templates/admin/import_export/import.html:137
+msgid "Preview"
+msgstr "Anteprima"
+
+#: templates/admin/import_export/import.html:152
+msgid "New"
+msgstr "Nuovo"
+
+#: templates/admin/import_export/import.html:154
+msgid "Skipped"
+msgstr "Salta"
+
+#: templates/admin/import_export/import.html:156
+msgid "Delete"
+msgstr "Cancella"
+
+#: templates/admin/import_export/import.html:158
+msgid "Update"
+msgstr "Aggiorna"
+
+#~ msgid "Import finished"
+#~ msgstr "Importazione terminata"

admin_interface/import_tema/static/import_export/import.css

@@ -0,0 +1,81 @@
+.import-preview .errors {
+  position: relative;
+}
+
+.validation-error-count {
+  display: inline-block;
+  background-color: #e40000;
+  border-radius: 6px;
+  color: white;
+  font-size: 0.9em;
+  position: relative;
+  font-weight: bold;
+  margin-top: -2px;
+  padding: 0.2em 0.4em;
+}
+
+.validation-error-container {
+  position: absolute;
+  opacity: 0;
+  pointer-events: none;
+  background-color: #ffc1c1;
+  padding: 14px 15px 10px;
+  top: 25px;
+  margin: 0 0 20px 0;
+  width: 200px;
+  z-index: 2;
+}
+
+table.import-preview tr.skip {
+  background-color: #d2d2d2;
+}
+
+table.import-preview tr.new {
+  background-color: #bdd8b2;
+}
+
+table.import-preview tr.delete {
+  background-color: #f9bebf;
+}
+
+table.import-preview tr.update {
+  background-color: #fdfdcf;
+}
+
+.import-preview td:hover .validation-error-count {
+  z-index: 3;
+}
+.import-preview td:hover .validation-error-container {
+  opacity: 1;
+  pointer-events: auto;
+}
+
+.validation-error-list {
+  margin: 0;
+  padding: 0;
+}
+
+.validation-error-list li {
+  list-style: none;
+  margin: 0;
+}
+
+.validation-error-list > li > ul {
+  margin: 8px 0;
+  padding: 0;
+}
+
+.validation-error-list > li > ul > li {
+  padding: 0;
+  margin: 0 0 10px;
+  line-height: 1.28em;
+}
+
+.validation-error-field-label {
+  display: block;
+  border-bottom: 1px solid #e40000;
+  color: #e40000;
+  text-transform: uppercase;
+  font-weight: bold;
+  font-size: 0.85em;
+}

admin_interface/import_tema/templates/admin/import_export/base.html

@@ -0,0 +1,17 @@
+{% extends "admin/base_site.html" %}
+{% load i18n admin_modify %}
+{% load admin_urls %}
+{% load static %}
+
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />{% endblock %}
+{% block bodyclass %}{{ block.super }} {{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %}
+{% if not is_popup %}
+{% block breadcrumbs %}
+<div class="breadcrumbs">
+<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
+&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
+&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
+&rsaquo; {% block breadcrumbs_last %}{% endblock %}
+</div>
+{% endblock %}
+{% endif %}

admin_interface/import_tema/templates/admin/import_export/change_list.html

@@ -0,0 +1,13 @@
+{% extends "admin/change_list.html" %}
+
+{# Original template renders object-tools only when has_add_permission is True. #}
+{# This hack allows sub templates to add to object-tools #}
+{% block object-tools %}
+  <ul class="object-tools">
+    {% block object-tools-items %}
+      {% if has_add_permission %}
+        {{ block.super }}
+      {% endif %}
+    {% endblock %}
+  </ul>
+{% endblock %}

admin_interface/import_tema/templates/admin/import_export/change_list_import.html

@@ -0,0 +1,6 @@
+{% extends "admin/import_export/change_list.html" %}
+
+{% block object-tools-items %}
+  {% include "admin/import_export/change_list_import_item.html" %}
+  {{ block.super }}
+{% endblock %}

admin_interface/import_tema/templates/admin/import_export/import.html

@@ -0,0 +1,171 @@
+{% extends "admin/import_export/base.html" %}
+{% load i18n %}
+{% load admin_urls %}
+{% load import_export_tags %}
+{% load static %}
+
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "import_export/import.css" %}" />{% endblock %}
+
+{% block breadcrumbs_last %}
+{% trans "Import" %}
+{% endblock %}
+
+{% block content %}
+
+  {% if confirm_form %}
+    <form action="{% url opts|admin_urlname:"process_import" %}" method="POST">
+      {% csrf_token %}
+      {{ confirm_form.as_p }}
+      <p>
+        {% trans "Below is a preview of data to be imported. If you are satisfied with the results, click 'Confirm import'" %}
+      </p>
+      <div class="submit-row">
+        <input type="submit" class="default" name="confirm" value="{% trans "Confirm import" %}">
+      </div>
+    </form>
+  {% else %}
+    <form action="" method="post" enctype="multipart/form-data">
+      {% csrf_token %}
+
+      <p>
+        {% trans "This importer will import the following fields: " %}
+        <code>{{ fields|join:", " }}</code>
+      </p>
+
+      <fieldset class="module aligned">
+        {% for field in form %}
+          <div class="form-row">
+            {{ field.errors }}
+
+            {{ field.label_tag }}
+
+            {{ field }}
+
+            {% if field.field.help_text %}
+            <p class="help">{{ field.field.help_text|safe }}</p>
+            {% endif %}
+          </div>
+        {% endfor %}
+      </fieldset>
+
+      <div class="submit-row">
+        <input type="submit" class="default" value="{% trans "Submit" %}">
+      </div>
+    </form>
+  {% endif %}
+
+  {% if result %}
+
+    {% if result.has_errors %}
+
+      <h2>{% trans "Errors" %}</h2>
+      <ul>
+        {% for error in result.base_errors  %}
+        <li>
+          {{ error.error }}
+          <div class="traceback">{{ error.traceback|linebreaks }}</div>
+        </li>
+        {% endfor %}
+        {% for line, errors in result.row_errors %}
+          {% for error in errors %}
+            <li>
+              {% trans "Line number" %}: {{ line }} - {{ error.error }}
+              <div><code>{{ error.row.values|join:", " }}</code></div>
+              <div class="traceback">{{ error.traceback|linebreaks }}</div>
+            </li>
+          {% endfor %}
+        {% endfor %}
+      </ul>
+
+    {% elif result.has_validation_errors %}
+
+      <h2>{% trans "Some rows failed to validate" %}</h2>
+        
+      <p>{% trans "Please correct these errors in your data where possible, then reupload it using the form above." %}</p>
+      
+      <table class="import-preview">
+        <thead>
+          <tr>
+            <th>{% trans "Row" %}</th>
+            <th>{% trans "Errors" %}</th>
+            {% for field in result.diff_headers %}
+              <th>{{ field }}</th>
+            {% endfor %}
+          </tr>
+        </thead>
+        <tbody>
+        {% for row in result.invalid_rows %}
+          <tr>
+            <td>{{ row.number }} </td>
+            <td class="errors">
+              <span class="validation-error-count">{{ row.error_count }}</span> 
+              <div class="validation-error-container">
+                <ul class="validation-error-list">
+                  {% for field_name, error_list in row.field_specific_errors.items %}
+                    <li>
+                        <span class="validation-error-field-label">{{ field_name }}</span>
+                        <ul>
+                          {% for error in error_list %}
+                            <li>{{ error }}</li>
+                          {% endfor %}
+                        </ul>
+                    </li>
+                  {% endfor %}
+                  {% if row.non_field_specific_errors %}
+                    <li>
+                      <span class="validation-error-field-label">{% trans "Non field specific" %}</span>
+                      <ul>
+                        {% for error in row.non_field_specific_errors %}
+                          <li>{{ error }}</li>
+                        {% endfor %}
+                      </ul>
+                    </li>
+                  {% endif %}
+                </ul>
+              </div>
+            </td>
+            {% for field in row.values %}
+              <td>{{ field }}</td>
+            {% endfor %}
+          </tr>
+        {% endfor %}
+        </tbody>
+      </table>
+  
+    {% else %}
+
+      <h2>{% trans "Preview" %}</h2>
+
+      <table class="import-preview">
+        <thead>
+          <tr>
+            <th></th>
+            {% for field in result.diff_headers %}
+              <th>{{ field }}</th>
+            {% endfor %}
+          </tr>
+        </thead>
+        {% for row in result.valid_rows %}
+          <tr class="{{ row.import_type }}">
+            <td class="import-type">
+              {% if row.import_type == 'new' %}
+                {% trans "New" %}
+              {% elif row.import_type == 'skip' %}
+                {% trans "Skipped" %}
+              {% elif row.import_type == 'delete' %}
+                {% trans "Delete" %}
+              {% elif row.import_type == 'update' %}
+                {% trans "Update" %}
+              {% endif %}
+            </td>
+            {% for field in row.diff %}
+              <td>{{ field }}</td>
+            {% endfor %}
+          </tr>
+        {% endfor %}
+      </table>
+
+    {% endif %}
+
+  {% endif %}
+{% endblock %}

admin_interface/migrations/0020_module_selected_colors.py

@@ -45,5 +45,5 @@ class Migration(migrations.Migration):
                 verbose_name="link selected color",
             ),
         ),
-        migrations.RunPython(default_link_selected),
+        migrations.RunPython(default_link_selected,migrations.RunPython.noop),
     ]

admin_interface/migrations/0025_add_demo_option.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", "0024_remove_theme_css"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="theme",
+            name="demo",
+            field=models.BooleanField(default=False, verbose_name="demo"),
+        ),
+    ]

admin_interface/migrations/0026_add_user_option.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", "0025_add_demo_option"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="theme",
+            name="user",
+            field=models.ForeignKey('auth.User', on_delete=models.CASCADE, null=True, blank=True, verbose_name="active for user"),
+        ),
+    ]

admin_interface/migrations/0027_usertheme_m2m.py

@@ -0,0 +1,37 @@
+# Generated by Django 3.2.13 on 2022-04-28 16:03
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('admin_interface', '0026_add_user_option'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='theme',
+            name='user',
+        ),
+        migrations.CreateModel(
+            name='UserTheme',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('theme', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='admin_interface.theme')),
+                ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, unique=True)),
+            ],
+            options={
+                'verbose_name': 'Users theme',
+                'verbose_name_plural': 'Users themes',
+            },
+        ),
+        migrations.AddField(
+            model_name='theme',
+            name='users',
+            field=models.ManyToManyField(through='admin_interface.UserTheme', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

admin_interface/migrations/0028_alter_theme_demo.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.4 on 2022-08-25 14:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0027_usertheme_m2m'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='theme',
+            name='demo',
+            field=models.BooleanField(default=False, verbose_name='is demo'),
+        ),
+    ]

admin_interface/migrations/0029_auto_20221025_1559.py

@@ -0,0 +1,32 @@
+# Generated by Django 4.0.3 on 2022-10-25 13:59
+
+from django.conf import settings
+import django.db.models.deletion
+from django.db import connection, migrations, models, transaction
+
+
+def forward(apps, schema_editor):
+    Theme = apps.get_model("admin_interface", "Theme")
+    if len(Theme.objects.all()) == 1 and Theme.objects.first().name == 'Django':
+        with transaction.atomic():
+            cursor = connection.cursor()
+            cursor.execute("""truncate table "admin_interface_theme" restart identity;""")
+
+def reverse(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0028_alter_theme_demo'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+        migrations.AlterField(
+            model_name='usertheme',
+            name='user',
+            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]

admin_interface/migrations/0030_theme_default.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.3 on 2023-01-30 14:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('admin_interface', '0029_auto_20221025_1559'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='theme',
+            name='default',
+            field=models.BooleanField(default=False, verbose_name='default'),
+        ),
+    ]

admin_interface/models.py

@@ -2,16 +2,28 @@
 
 from __future__ import unicode_literals
 
-from admin_interface.cache import del_cached_active_theme
-from admin_interface.compat import FileExtensionValidator, force_str, gettext_lazy as _
+import inspect
 
 from colorfield.fields import ColorField
-
 from django.db import models
 from django.db.models.signals import post_delete, post_save, pre_save
-
 from six import python_2_unicode_compatible
 
+from admin_interface.cache import del_cached_active_theme
+from admin_interface.compat import FileExtensionValidator, force_str
+from admin_interface.compat import gettext_lazy as _
+
+
+@python_2_unicode_compatible
+class UserTheme(models.Model):
+    class Meta:
+        verbose_name = 'Users theme'
+        verbose_name_plural = 'Users themes'
+
+    user = models.OneToOneField(
+        'auth.User', on_delete=models.CASCADE, null=True)
+    theme = models.ForeignKey('Theme', on_delete=models.CASCADE)
+
 
 @python_2_unicode_compatible
 class Theme(models.Model):
@@ -25,26 +37,27 @@ class Theme(models.Model):
         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 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 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
+        user_theme_manager = UserTheme.objects
         objs_active_qs = objs_manager.filter(active=True)
         objs_active_ls = list(objs_active_qs)
         objs_active_count = len(objs_active_ls)
@@ -53,15 +66,31 @@ class Theme(models.Model):
             obj = objs_manager.all().first()
             if obj:
                 obj.set_active()
-            else:
-                obj = objs_manager.create()
+            # else:
+            #     obj = objs_manager.create()
 
         elif objs_active_count == 1:
             obj = objs_active_ls[0]
 
         elif objs_active_count > 1:
-            obj = objs_active_ls[-1]
-            obj.set_active()
+            for frame_record in inspect.stack():
+                if frame_record[3] == 'get_response':
+                    request = frame_record[0].f_locals['request']
+                    user = request.user
+                    break
+            else:
+                request = None
+
+            try:
+                return user_theme_manager.filter(user=user, theme__active=True).first().theme
+            except:
+                objs_default_qs = objs_active_qs.filter(default=True)
+                if len(objs_default_qs) == 0:
+                    obj = objs_active_qs.first()
+                    if obj:
+                        obj.set_default()
+                else:
+                    obj = objs_default_qs.first()
 
         return obj
 
@@ -70,6 +99,12 @@ class Theme(models.Model):
     )
     active = models.BooleanField(default=True, verbose_name=_("active"))
 
+    demo = models.BooleanField(default=False, verbose_name=_("is demo"))
+    
+    default = models.BooleanField(default=False, verbose_name="default")
+
+    users = models.ManyToManyField('auth.User', through=UserTheme)
+
     title = models.CharField(
         max_length=50,
         default=_("Django administration"),
@@ -83,7 +118,8 @@ class Theme(models.Model):
         max_length=10,
         verbose_name=_("color"),
     )
-    title_visible = models.BooleanField(default=True, verbose_name=_("visible"))
+    title_visible = models.BooleanField(
+        default=True, verbose_name=_("visible"))
 
     logo = models.FileField(
         upload_to="admin-interface/logo/",
@@ -123,7 +159,8 @@ class Theme(models.Model):
         verbose_name=_("favicon"),
     )
 
-    env_name = models.CharField(blank=True, max_length=50, verbose_name=_("name"))
+    env_name = models.CharField(
+        blank=True, max_length=50, verbose_name=_("name"))
     env_color = ColorField(
         blank=True,
         default="#E74C3C",
@@ -294,7 +331,8 @@ class Theme(models.Model):
         verbose_name=_("text color"),
     )
 
-    related_modal_active = models.BooleanField(default=True, verbose_name=_("active"))
+    related_modal_active = models.BooleanField(
+        default=True, verbose_name=_("active"))
     related_modal_background_color = ColorField(
         blank=True,
         default="#000000",
@@ -361,7 +399,8 @@ class Theme(models.Model):
         default=True, verbose_name=_("sticky position")
     )
 
-    foldable_apps = models.BooleanField(default=True, verbose_name=_("foldable apps"))
+    foldable_apps = models.BooleanField(
+        default=True, verbose_name=_("foldable apps"))
 
     recent_actions_visible = models.BooleanField(
         default=True, verbose_name=_("visible")
@@ -378,6 +417,15 @@ class Theme(models.Model):
         self.active = True
         self.save()
 
+    def set_default(self):
+        self.default = True
+        self.save()
+
+    def save(self):
+        if self.default:
+            Theme.objects.update(default=False)
+        super().save()
+
     class Meta:
         app_label = "admin_interface"
 
@@ -389,5 +437,5 @@ 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)
+# post_save.connect(Theme.post_save_handler, sender=Theme)
+# pre_save.connect(Theme.pre_save_handler, sender=Theme)

admin_interface/static/admin/js/popup_response.js

@@ -16,6 +16,7 @@
         }
         windowRef = {
             name: widgetName,
+            location: windowRef.location,
             close: function() {
                 openerRef.dismissRelatedObjectModal();
             }

admin_interface/templates/admin/base_site.html

@@ -2,13 +2,10 @@
 {% load i18n static admin_interface_tags %}
 
 {% block title %}
-{% get_admin_interface_theme as theme %}
 {% if title %}{{ title }} | {% endif %}{% if theme.title %}{% trans theme.title %}{% else %}{{ site_title|default:_('Django administration') }}{% endif %}
 {% endblock %}
 
 {% block extrastyle %}
-{% get_admin_interface_theme as theme %}
-{% get_admin_interface_nocache as version_md5_cache %}
 {% get_current_language as current_lang %}
 <style type="text/css">
 {% include "admin_interface/css/admin-interface.css" %}
@@ -35,12 +32,10 @@
 
 {% block blockbots %}
 {{ block.super }}
-{% get_admin_interface_theme as theme %}
-{% get_admin_interface_nocache as version_md5_cache %}
 {# https://github.com/elky/django-flat-responsive#important-note #}
 <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
-<link rel="stylesheet" type="text/css" href="{% static 'admin/css/responsive.css' %}?nocache={{ version_md5_cache }}">
-<link rel="stylesheet" type="text/css" href="{% static 'admin/css/responsive_rtl.css' %}?nocache={{ version_md5_cache }}">
+<link rel="stylesheet" type="text/css" href="{% static 'admin/css/responsive.css' %}">
+<link rel="stylesheet" type="text/css" href="{% static 'admin/css/responsive_rtl.css' %}">
 {% include "admin_interface/favicon.html" %}
 {% include "admin_interface/foldable-apps.html" %}
 {% include "admin_interface/related-modal.html" %}
@@ -51,7 +46,6 @@
 {% endblock %}
 
 {% block bodyclass %}
-{% get_admin_interface_theme as theme %}
 flat-theme admin-interface
 {% if theme.name %} {{ theme.name|slugify }}-theme {% endif %}
 {% if theme.foldable_apps %} foldable-apps {% endif %}
@@ -60,7 +54,6 @@ flat-theme admin-interface
 {% endblock %}
 
 {% block branding %}
-{% get_admin_interface_theme as theme %}
 <h1 id="site-name">
     <a href="{% url 'admin:index' %}">
         {% if theme.logo_visible %}
@@ -78,10 +71,9 @@ flat-theme admin-interface
 {% endblock %}
 
 {% block welcome-msg %}
-{% get_admin_interface_theme as theme %}
 {% if theme.language_chooser_active %}
     {% get_admin_interface_languages as languages %}
     {% include "admin_interface/language_chooser.html" %}
 {% endif %}
-{% if theme.env_visible_in_header %}<span class="environment-label {{ theme.env_name }}"></span><br>{% endif %}{{ block.super }}<br>
+{% if theme.env_visible_in_header %}<span class="environment-label"></span><br>{% endif %}{{ block.super }}<br>
 {% endblock %}

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

@@ -103,7 +103,7 @@
 .admin-interface #user-tools {
     margin-top: 10px;
     margin-bottom: 10px;
-    white-space: nowrap;
+    white-space: normal;
     align-self: flex-start;
 }
 

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

@@ -164,12 +164,15 @@
     {% endif %}
 }
 
-.admin-interface #header #user-tools a {
+.admin-interface #header #user-tools a,
+.admin-interface #header #user-tools button {
     color:{{ theme.css_header_link_color }};
 }
 
 .admin-interface #header #user-tools a:hover,
-.admin-interface #header #user-tools a:active {
+.admin-interface #header #user-tools a:active,
+.admin-interface #header #user-tools button:active,
+.admin-interface #header #user-tools button:hover {
     color:{{ theme.css_header_link_hover_color }};
     border-bottom-color:rgba(255, 255, 255, 0.5);
 }

admin_interface/templates/admin_interface/favicon.html

@@ -3,7 +3,7 @@
 {% if theme.favicon %}
 <link rel="icon" href="{{ theme.favicon.url }}">
 {% if theme.env_visible_in_favicon %}
-<script type="text/javascript" src="{% static 'admin_interface/favico/favico-0.3.10-patched.min.js' %}?nocache={{ version_md5_cache }}"></script>
+<script type="text/javascript" src="{% static 'admin_interface/favico/favico-0.3.10-patched.min.js' %}"></script>
 <script type="text/javascript">
 var favicon = new Favico({
     type: 'circle',

admin_interface/templates/admin_interface/foldable-apps.html

@@ -1,6 +1,6 @@
 {% load static %}
 
 {% if theme.foldable_apps %}
-<link rel="stylesheet" type="text/css" href="{% static 'admin_interface/foldable-apps/foldable-apps.css' %}?nocache={{ version_md5_cache }}">
-<script type="text/javascript" src="{% static 'admin_interface/foldable-apps/foldable-apps.js' %}?nocache={{ version_md5_cache }}"></script>
+<link rel="stylesheet" type="text/css" href="{% static 'admin_interface/foldable-apps/foldable-apps.css' %}">
+<script type="text/javascript" src="{% static 'admin_interface/foldable-apps/foldable-apps.js' %}"></script>
 {% endif %}

admin_interface/templates/admin_interface/related-modal.html

@@ -1,7 +1,7 @@
 {% load static %}
 
 {% if theme.related_modal_active %}
-<link rel="stylesheet" type="text/css" href="{% static 'admin_interface/magnific-popup/magnific-popup.css' %}?nocache={{ version_md5_cache }}">
-<script type="text/javascript" src="{% static 'admin_interface/magnific-popup/jquery.magnific-popup.js' %}?nocache={{ version_md5_cache }}"></script>
-<script type="text/javascript" src="{% static 'admin_interface/related-modal/related-modal.js' %}?nocache={{ version_md5_cache }}"></script>
+<link rel="stylesheet" type="text/css" href="{% static 'admin_interface/magnific-popup/magnific-popup.css' %}">
+<script type="text/javascript" src="{% static 'admin_interface/magnific-popup/jquery.magnific-popup.js' %}"></script>
+<script type="text/javascript" src="{% static 'admin_interface/related-modal/related-modal.js' %}"></script>
 {% endif %}

admin_interface/templatetags/admin_interface_tags.py

@@ -67,10 +67,10 @@ def get_admin_interface_languages(context):
 
 @simple_tag(takes_context=True)
 def get_admin_interface_theme(context):
-    theme = get_cached_active_theme()
-    if not theme:
-        theme = Theme.get_active_theme()
-        set_cached_active_theme(theme)
+    # theme = get_cached_active_theme()
+    # if not theme:
+    theme = Theme.get_active_theme()
+        # set_cached_active_theme(theme)
     return theme
 
 

admin_interface/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = "0.18.7"
+__version__ = "0.19.8"