django-smartbase-admin 0.2.77__tar.gz → 0.2.79__tar.gz

{django_smartbase_admin-0.2.77 → django_smartbase_admin-0.2.79}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-smartbase-admin
-Version: 0.2.77
+Version: 0.2.79
 Summary: 
 Author: SmartBase
 Author-email: info@smartbase.sk

{django_smartbase_admin-0.2.77 → django_smartbase_admin-0.2.79}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-smartbase-admin"
-version = "0.2.77"
+version = "0.2.79"
 description = ""
 authors = ["SmartBase <info@smartbase.sk>"]
 readme = "README.md"

{django_smartbase_admin-0.2.77 → django_smartbase_admin-0.2.79}/src/django_smartbase_admin/admin/admin_base.py

@@ -28,7 +28,8 @@ from django.utils.safestring import mark_safe
 from django.utils.text import capfirst
 from django.utils.translation import gettext_lazy as _
 from django_admin_inline_paginator.admin import TabularInlinePaginated
-from filer.fields.image import AdminImageFormField
+from filer.fields.file import FilerFileField
+from filer.fields.image import AdminImageFormField, FilerImageField
 from nested_admin.nested import (
     NestedModelAdmin,
     NestedTabularInline,
@@ -74,6 +75,15 @@ except ImportError:
     pass
 
 
+color_field_enabled = None
+try:
+    from colorfield.fields import ColorField
+
+    color_field_enabled = True
+except ImportError:
+    pass
+
+
 from django_smartbase_admin.admin.widgets import (
     SBAdminTextInputWidget,
     SBAdminTextareaWidget,
@@ -97,6 +107,8 @@ from django_smartbase_admin.admin.widgets import (
     SBAdminCKEditorUploadingWidget,
     SBAdminAttributesWidget,
     SBAdminMultipleChoiceInlineWidget,
+    SBAdminColorWidget,
+    SBAdminFilerFileWidget,
 )
 from django_smartbase_admin.engine.admin_base_view import (
     SBAdminBaseListView,
@@ -142,10 +154,16 @@ class SBAdminFormFieldWidgetsMixin:
         ReadOnlyPasswordHashWidget: SBAdminReadOnlyPasswordHashWidget,
         forms.HiddenInput: SBAdminHiddenWidget,
     }
+    db_field_widgets = {
+        FilerImageField: SBAdminFilerFileWidget,
+        FilerFileField: SBAdminFilerFileWidget,
+    }
     if postrgres_enabled:
         formfield_widgets[SimpleArrayField] = SBAdminArrayWidget
     if django_cms_attributes:
         formfield_widgets[AttributesFormField] = SBAdminAttributesWidget
+    if color_field_enabled:
+        db_field_widgets[ColorField] = SBAdminColorWidget
 
     django_widget_to_widget = {
         forms.PasswordInput: SBAdminPasswordInputWidget,
@@ -153,7 +171,9 @@ class SBAdminFormFieldWidgetsMixin:
     }
 
     def get_form_field_widget_class(self, form_field, db_field, request):
-        default_widget_class = self.formfield_widgets.get(form_field.__class__)
+        default_widget_class = self.db_field_widgets.get(
+            db_field.__class__, self.formfield_widgets.get(form_field.__class__)
+        )
         if not hasattr(request, "request_data"):
             # in case of login the view is not wrapped and we have no request_data present
             return default_widget_class

{django_smartbase_admin-0.2.77 → django_smartbase_admin-0.2.79}/src/django_smartbase_admin/admin/widgets.py

@@ -1,4 +1,5 @@
 import json
+import logging
 
 from ckeditor.widgets import CKEditorWidget
 from ckeditor_uploader.widgets import CKEditorUploadingWidget
@@ -6,12 +7,19 @@ from django import forms
 from django.conf import settings
 from django.contrib.admin.widgets import (
     AdminURLFieldWidget,
+    ForeignKeyRawIdWidget,
 )
 from django.contrib.auth.forms import ReadOnlyPasswordHashWidget
+from django.template.loader import render_to_string
+from django.urls import reverse
 from django.utils.formats import get_format
+from django.utils.http import urlencode
+from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from django.views.generic.base import ContextMixin
+from filer.fields.file import AdminFileWidget as FilerAdminFileWidget
 from filer.fields.image import AdminImageWidget
+from filer.models import File
 
 from django_smartbase_admin.engine.filter_widgets import (
     AutocompleteFilterWidget,
@@ -19,6 +27,8 @@ from django_smartbase_admin.engine.filter_widgets import (
 from django_smartbase_admin.services.thread_local import SBAdminThreadLocalService
 from django_smartbase_admin.templatetags.sb_admin_tags import SBAdminJSONEncoder
 
+logger = logging.getLogger(__name__)
+
 
 class SBAdminBaseWidget(ContextMixin):
     sb_admin_widget = True
@@ -379,6 +389,75 @@ class SBAdminImageWidget(SBAdminBaseWidget, AdminImageWidget):
         )
 
 
+class SBAdminFilerFileWidget(SBAdminBaseWidget, FilerAdminFileWidget):
+    template_name = "sb_admin/widgets/filer_file.html"
+
+    def __init__(self, form_field=None, *args, **kwargs):
+        self.form_field = form_field
+        super(FilerAdminFileWidget, self).__init__(
+            form_field.rel, form_field.view.admin_site
+        )
+
+    def render(self, name, value, attrs=None, renderer=None):
+        obj = self.obj_for_value(value)
+        css_id = attrs.get("id", "id_image_x")
+        related_url = None
+        change_url = ""
+        if value:
+            try:
+                file_obj = File.objects.get(pk=value)
+                if file_obj.logical_folder.is_root:
+                    related_url = reverse("sb_admin:filer-directory_listing-root")
+                else:
+                    related_url = reverse(
+                        "sb_admin:filer-directory_listing",
+                        args=(file_obj.logical_folder.id,),
+                    )
+                change_url = reverse(
+                    "sb_admin:{}_{}_change".format(
+                        file_obj._meta.app_label,
+                        file_obj._meta.model_name,
+                    ),
+                    args=(file_obj.pk,),
+                )
+            except Exception as e:
+                # catch exception and manage it. We can re-raise it for debugging
+                # purposes and/or just logging it, provided user configured
+                # proper logging configuration
+                if settings.FILER_ENABLE_LOGGING:
+                    logger.error("Error while rendering file widget: %s", e)
+                if settings.FILER_DEBUG:
+                    raise
+        if not related_url:
+            related_url = reverse("sb_admin:filer-directory_listing-last")
+        params = self.url_parameters()
+        params["_pick"] = "file"
+        if params:
+            lookup_url = "?" + urlencode(sorted(params.items()))
+        else:
+            lookup_url = ""
+        if "class" not in attrs:
+            # The JavaScript looks for this hook.
+            attrs["class"] = "vForeignKeyRawIdAdminField"
+        # rendering the super for ForeignKeyRawIdWidget on purpose here because
+        # we only need the input and none of the other stuff that
+        # ForeignKeyRawIdWidget adds
+        hidden_input = super(ForeignKeyRawIdWidget, self).render(
+            name, value, attrs
+        )  # grandparent super
+        context = {
+            "hidden_input": hidden_input,
+            "lookup_url": "{}{}".format(related_url, lookup_url),
+            "change_url": change_url,
+            "object": obj,
+            "lookup_name": name,
+            "id": css_id,
+            "admin_icon_delete": "admin/img/icon-deletelink.svg",
+        }
+        html = render_to_string(self.template_name, context)
+        return mark_safe(html)
+
+
 class SBAdminReadOnlyPasswordHashWidget(SBAdminBaseWidget, ReadOnlyPasswordHashWidget):
     template_name = "sb_admin/widgets/read_only_password_hash.html"
 
@@ -423,3 +502,41 @@ class SBAdminCodeWidget(SBAdminBaseWidget, forms.Widget):
 
 class SBAdminHTMLWidget(SBAdminBaseWidget, forms.Widget):
     template_name = "sb_admin/widgets/html_read_only.html"
+
+
+class SBAdminColorWidget(SBAdminTextInputWidget):
+    template_name = "sb_admin/widgets/color_field.html"
+    color_swatches = getattr(
+        settings,
+        "SB_ADMIN_COLOR_SWATCHES",
+        [
+            "#ffbe76",
+            "#f9ca24",
+            "#f0932b",
+            "#ff7979",
+            "#eb4d4b",
+            "#badc58",
+            "#6ab04c",
+            "#c7ecee",
+            "#7ed6df",
+            "#22a6b3",
+            "#e056fd",
+            "#be2edd",
+            "#686de0",
+            "#4834d4",
+            "#30336b",
+            "#130f40",
+            "#95afc0",
+            "#535c68",
+        ],
+    )
+
+    class Media:
+        css = {
+            "all": [
+                "sb_admin/css/coloris/coloris.min.css",
+            ],
+        }
+        js = [
+            "sb_admin/js/coloris/coloris.min.js",
+        ]

{django_smartbase_admin-0.2.77 → django_smartbase_admin-0.2.79}/src/django_smartbase_admin/monkeypatch/admin_readonly_field_monkeypatch.py

@@ -8,6 +8,8 @@ from django.template.loader import render_to_string
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 
+from django_smartbase_admin.admin.site import sb_admin_site
+
 
 class SBAdminReadonlyField(django.contrib.admin.helpers.AdminReadonlyField):
     readonly_template = "sb_admin/includes/readonly_field.html"
@@ -26,6 +28,9 @@ class SBAdminReadonlyField(django.contrib.admin.helpers.AdminReadonlyField):
         )
 
     def contents(self, request=None):
+        if self.model_admin.admin_site.name != sb_admin_site.name:
+            return super().contents()
+
         field, obj, model_admin = (
             self.field["field"],
             self.form.instance,

{django_smartbase_admin-0.2.77 → django_smartbase_admin-0.2.79}/src/django_smartbase_admin/services/views.py

@@ -2,6 +2,7 @@ import json
 import pickle
 import urllib
 
+from django.conf import settings
 from django.db.models import Q, FilteredRelation, F, Value, CharField
 from django.shortcuts import redirect
 from django_smartbase_admin.templatetags.sb_admin_tags import SBAdminJSONEncoder
@@ -105,7 +106,9 @@ class SBAdminViewService(object):
             response.render()
         response.content = (
             response.content.decode()
-            .replace('href="/admin/', 'href="/sb-admin/')
+            .replace(
+                f'href="/{settings.ADMIN_PATH}', f'href="/{settings.SB_ADMIN_PATH}'
+            )
             .encode()
         )
         return response

django_smartbase_admin-0.2.79/src/django_smartbase_admin/settings.py

@@ -0,0 +1,4 @@
+from django.conf import settings
+
+SB_ADMIN_PATH = getattr(settings, "SB_ADMIN_PATH", "sb-admin/")
+setattr(settings, "SB_ADMIN_PATH", SB_ADMIN_PATH)

django_smartbase_admin-0.2.79/src/django_smartbase_admin/static/sb_admin/css/coloris/coloris.min.css

@@ -0,0 +1 @@
+.clr-picker{display:none;flex-wrap:wrap;position:absolute;width:200px;z-index:1000;border-radius:10px;background-color:#fff;justify-content:flex-end;direction:ltr;box-shadow:0 0 5px rgba(0,0,0,.05),0 5px 20px rgba(0,0,0,.1);-moz-user-select:none;-webkit-user-select:none;user-select:none}.clr-picker.clr-open,.clr-picker[data-inline=true]{display:flex}.clr-picker[data-inline=true]{position:relative}.clr-gradient{position:relative;width:100%;height:100px;margin-bottom:15px;border-radius:3px 3px 0 0;background-image:linear-gradient(rgba(0,0,0,0),#000),linear-gradient(90deg,#fff,currentColor);cursor:pointer}.clr-marker{position:absolute;width:12px;height:12px;margin:-6px 0 0 -6px;border:1px solid #fff;border-radius:50%;background-color:currentColor;cursor:pointer}.clr-picker input[type=range]::-webkit-slider-runnable-track{width:100%;height:16px}.clr-picker input[type=range]::-webkit-slider-thumb{width:16px;height:16px;-webkit-appearance:none}.clr-picker input[type=range]::-moz-range-track{width:100%;height:16px;border:0}.clr-picker input[type=range]::-moz-range-thumb{width:16px;height:16px;border:0}.clr-hue{background-image:linear-gradient(to right,red 0,#ff0 16.66%,#0f0 33.33%,#0ff 50%,#00f 66.66%,#f0f 83.33%,red 100%)}.clr-alpha,.clr-hue{position:relative;width:calc(100% - 40px);height:8px;margin:5px 20px;border-radius:4px}.clr-alpha span{display:block;height:100%;width:100%;border-radius:inherit;background-image:linear-gradient(90deg,rgba(0,0,0,0),currentColor)}.clr-alpha input[type=range],.clr-hue input[type=range]{position:absolute;width:calc(100% + 32px);height:16px;left:-16px;top:-4px;margin:0;background-color:transparent;opacity:0;cursor:pointer;appearance:none;-webkit-appearance:none}.clr-alpha div,.clr-hue div{position:absolute;width:16px;height:16px;left:0;top:50%;margin-left:-8px;transform:translateY(-50%);border:2px solid #fff;border-radius:50%;background-color:currentColor;box-shadow:0 0 1px #888;pointer-events:none}.clr-alpha div:before{content:'';position:absolute;height:100%;width:100%;left:0;top:0;border-radius:50%;background-color:currentColor}.clr-format{display:none;order:1;width:calc(100% - 40px);margin:0 20px 20px}.clr-segmented{display:flex;position:relative;width:100%;margin:0;padding:0;border:1px solid #ddd;border-radius:15px;box-sizing:border-box;color:#999;font-size:12px}.clr-segmented input,.clr-segmented legend{position:absolute;width:100%;height:100%;margin:0;padding:0;border:0;left:0;top:0;opacity:0;pointer-events:none}.clr-segmented label{flex-grow:1;margin:0;padding:4px 0;font-size:inherit;font-weight:400;line-height:initial;text-align:center;cursor:pointer}.clr-segmented label:first-of-type{border-radius:10px 0 0 10px}.clr-segmented label:last-of-type{border-radius:0 10px 10px 0}.clr-segmented input:checked+label{color:#fff;background-color:#666}.clr-swatches{order:2;width:calc(100% - 32px);margin:0 16px}.clr-swatches div{display:flex;flex-wrap:wrap;padding-bottom:12px;justify-content:center}.clr-swatches button{position:relative;width:20px;height:20px;margin:0 4px 6px 4px;padding:0;border:0;border-radius:50%;color:inherit;text-indent:-1000px;white-space:nowrap;overflow:hidden;cursor:pointer}.clr-swatches button:after{content:'';display:block;position:absolute;width:100%;height:100%;left:0;top:0;border-radius:inherit;background-color:currentColor;box-shadow:inset 0 0 0 1px rgba(0,0,0,.1)}input.clr-color{order:1;width:calc(100% - 80px);height:32px;margin:15px 20px 20px auto;padding:0 10px;border:1px solid #ddd;border-radius:16px;color:#444;background-color:#fff;font-family:sans-serif;font-size:14px;text-align:center;box-shadow:none}input.clr-color:focus{outline:0;border:1px solid #1e90ff}.clr-clear,.clr-close{display:none;order:2;height:24px;margin:0 20px 20px;padding:0 20px;border:0;border-radius:12px;color:#fff;background-color:#666;font-family:inherit;font-size:12px;font-weight:400;cursor:pointer}.clr-close{display:block;margin:0 20px 20px auto}.clr-preview{position:relative;width:32px;height:32px;margin:15px 0 20px 20px;border-radius:50%;overflow:hidden}.clr-preview:after,.clr-preview:before{content:'';position:absolute;height:100%;width:100%;left:0;top:0;border:1px solid #fff;border-radius:50%}.clr-preview:after{border:0;background-color:currentColor;box-shadow:inset 0 0 0 1px rgba(0,0,0,.1)}.clr-preview button{position:absolute;width:100%;height:100%;z-index:1;margin:0;padding:0;border:0;border-radius:50%;outline-offset:-2px;background-color:transparent;text-indent:-9999px;cursor:pointer;overflow:hidden}.clr-alpha div,.clr-color,.clr-hue div,.clr-marker{box-sizing:border-box}.clr-field{display:inline-block;position:relative;color:transparent}.clr-field input{margin:0;direction:ltr}.clr-field.clr-rtl input{text-align:right}.clr-field button{position:absolute;width:30px;height:100%;right:0;top:50%;transform:translateY(-50%);margin:0;padding:0;border:0;color:inherit;text-indent:-1000px;white-space:nowrap;overflow:hidden;pointer-events:none}.clr-field.clr-rtl button{right:auto;left:0}.clr-field button:after{content:'';display:block;position:absolute;width:100%;height:100%;left:0;top:0;border-radius:inherit;background-color:currentColor;box-shadow:inset 0 0 1px rgba(0,0,0,.5)}.clr-alpha,.clr-alpha div,.clr-field button,.clr-preview:before,.clr-swatches button{background-image:repeating-linear-gradient(45deg,#aaa 25%,transparent 25%,transparent 75%,#aaa 75%,#aaa),repeating-linear-gradient(45deg,#aaa 25%,#fff 25%,#fff 75%,#aaa 75%,#aaa);background-position:0 0,4px 4px;background-size:8px 8px}.clr-marker:focus{outline:0}.clr-keyboard-nav .clr-alpha input:focus+div,.clr-keyboard-nav .clr-hue input:focus+div,.clr-keyboard-nav .clr-marker:focus,.clr-keyboard-nav .clr-segmented input:focus+label{outline:0;box-shadow:0 0 0 2px #1e90ff,0 0 2px 2px #fff}.clr-picker[data-alpha=false] .clr-alpha{display:none}.clr-picker[data-minimal=true]{padding-top:16px}.clr-picker[data-minimal=true] .clr-alpha,.clr-picker[data-minimal=true] .clr-color,.clr-picker[data-minimal=true] .clr-gradient,.clr-picker[data-minimal=true] .clr-hue,.clr-picker[data-minimal=true] .clr-preview{display:none}.clr-dark{background-color:#444}.clr-dark .clr-segmented{border-color:#777}.clr-dark .clr-swatches button:after{box-shadow:inset 0 0 0 1px rgba(255,255,255,.3)}.clr-dark input.clr-color{color:#fff;border-color:#777;background-color:#555}.clr-dark input.clr-color:focus{border-color:#1e90ff}.clr-dark .clr-preview:after{box-shadow:inset 0 0 0 1px rgba(255,255,255,.5)}.clr-dark .clr-alpha,.clr-dark .clr-alpha div,.clr-dark .clr-preview:before,.clr-dark .clr-swatches button{background-image:repeating-linear-gradient(45deg,#666 25%,transparent 25%,transparent 75%,#888 75%,#888),repeating-linear-gradient(45deg,#888 25%,#444 25%,#444 75%,#888 75%,#888)}.clr-picker.clr-polaroid{border-radius:6px;box-shadow:0 0 5px rgba(0,0,0,.1),0 5px 30px rgba(0,0,0,.2)}.clr-picker.clr-polaroid:before{content:'';display:block;position:absolute;width:16px;height:10px;left:20px;top:-10px;border:solid transparent;border-width:0 8px 10px 8px;border-bottom-color:currentColor;box-sizing:border-box;color:#fff;filter:drop-shadow(0 -4px 3px rgba(0,0,0,.1));pointer-events:none}.clr-picker.clr-polaroid.clr-dark:before{color:#444}.clr-picker.clr-polaroid.clr-left:before{left:auto;right:20px}.clr-picker.clr-polaroid.clr-top:before{top:auto;bottom:-10px;transform:rotateZ(180deg)}.clr-polaroid .clr-gradient{width:calc(100% - 20px);height:120px;margin:10px;border-radius:3px}.clr-polaroid .clr-alpha,.clr-polaroid .clr-hue{width:calc(100% - 30px);height:10px;margin:6px 15px;border-radius:5px}.clr-polaroid .clr-alpha div,.clr-polaroid .clr-hue div{box-shadow:0 0 5px rgba(0,0,0,.2)}.clr-polaroid .clr-format{width:calc(100% - 20px);margin:0 10px 15px}.clr-polaroid .clr-swatches{width:calc(100% - 12px);margin:0 6px}.clr-polaroid .clr-swatches div{padding-bottom:10px}.clr-polaroid .clr-swatches button{width:22px;height:22px}.clr-polaroid input.clr-color{width:calc(100% - 60px);margin:10px 10px 15px auto}.clr-polaroid .clr-clear{margin:0 10px 15px 10px}.clr-polaroid .clr-close{margin:0 10px 15px auto}.clr-polaroid .clr-preview{margin:10px 0 15px 10px}.clr-picker.clr-large{width:275px}.clr-large .clr-gradient{height:150px}.clr-large .clr-swatches button{width:22px;height:22px}.clr-picker.clr-pill{width:380px;padding-left:180px;box-sizing:border-box}.clr-pill .clr-gradient{position:absolute;width:180px;height:100%;left:0;top:0;margin-bottom:0;border-radius:3px 0 0 3px}.clr-pill .clr-hue{margin-top:20px}