Merge pull request #103 from globophobe/feature/own-static

Version 0.6.1

.gitignore

@@ -2,6 +2,7 @@
 *.sqlite3
 .env
 .coverage
+.DS_Store
 dist/
 static/
 media/

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-semantic-admin"
-version = "0.6.0"
+version = "0.6.1"
 description = "Django Semantic UI Admin theme"
 authors = ["Alex <globophobe@gmail.com>"]
 readme = "README.md"

semantic_admin/admin.py

@@ -82,12 +82,14 @@ class SemanticBaseModelAdmin(BaseModelAdmin):
 
     def __init__(self, *args, **kwargs) -> None:
         """Initialize"""
+        original_formfield_overrides = copy.deepcopy(self.formfield_overrides)
         super().__init__(*args, **kwargs)
         # Simply overwrite
         overrides = copy.deepcopy(SEMANTIC_FORMFIELD_FOR_DBFIELD_DEFAULTS)
         for k, v in overrides.items():
             self.formfield_overrides.setdefault(k, {}).update(v)
-        self.formfield_overrides = overrides
+        for k, v in original_formfield_overrides.items():
+            self.formfield_overrides.setdefault(k, {}).update(v)
 
     def formfield_for_choice_field(
         self, db_field: str, request: HttpRequest, **kwargs

semantic_admin/templates/admin/change_form.html

@@ -1,11 +1,10 @@
 {# comment Extend base_site.html instead of change_form.html b/c override extrastyle without block.super #}
 {% extends "admin/base_site.html" %}
 {% load i18n admin_urls static admin_modify semantic_utils %}
-{% has_url 'javascript-catalog' as javascript_catalog %}
 
 {% block extrahead %}{{ block.super }}
-<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
-{{ media }}
+  <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
+  {{ media }}
 {% endblock %}
 
 <div class="ui stackable grid">
@@ -133,21 +132,20 @@
         });
 
         const languageCode = '{{ LANGUAGE_CODE|default:"en-us" }}';
-        const hasJavascriptCatalog = {% if javascript_catalog %}true{% else %}false{% endif %};
 
         // Datetime
         $row.find('.ui.calendar.datetime').not('[name*=__prefix__]').each(function() {
-            $(this).calendar(getCalendarOptions('datetime', hasJavascriptCatalog));
+            $(this).calendar(getCalendarOptions('datetime', true));
         });
 
         // Date
         $row.find('.ui.calendar.date').not('[name*=__prefix__]').each(function() {
-            $(this).calendar(getCalendarOptions('date', hasJavascriptCatalog));
+            $(this).calendar(getCalendarOptions('date', true));
         });
 
         // Time
         $row.find('.ui.calendar.time').not('[name*=__prefix__]').each(function() {
-            $(this).calendar(getCalendarOptions('time', hasJavascriptCatalog));
+            $(this).calendar(getCalendarOptions('time', true));
         });
 
     };

semantic_admin/templates/admin/change_list.html

@@ -7,6 +7,7 @@
 {% endblock %}
 
 {% block extrahead %}
+  <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
   {{ block.super }}
   {{ cl.model_admin.filterset.form.media.js }}
 {% endblock %}

semantic_admin/templatetags/semantic_utils.py

@@ -1,5 +1,5 @@
 import datetime
-from typing import Generator
+from collections.abc import Generator
 
 from django import template
 from django.contrib.admin.templatetags.admin_list import (
@@ -272,14 +272,3 @@ def semantic_paginator_number(cl: ChangeList, i: int) -> str:
             mark_safe(" end" if i == cl.paginator.num_pages else ""),
             i,
         )
-
-
-@register.simple_tag
-def has_url(url: str) -> bool:
-    """Does the url exist?"""
-    try:
-        reverse(url)
-    except NoReverseMatch:
-        return False
-    else:
-        return True