fix module for complexblocks

Author: raagin

streamfield/admin.py

@@ -1,8 +1,16 @@
 import json
+from importlib import import_module
 from django.contrib import admin
 from django.contrib.admin.options import TO_FIELD_VAR
 from django.template.response import TemplateResponse
-from .settings import STREAMBLOCKS_MODELS
+from django.conf import settings
+
+STREAMBLOCKS_APP_PATH = getattr(settings, "STREAMFIELD_STREAMBLOCKS_APP_PATH", "streamblocks")
+try:
+    streamblocks_app = import_module("%s.models" % STREAMBLOCKS_APP_PATH)
+    STREAMBLOCKS_MODELS = streamblocks_app.STREAMBLOCKS_MODELS
+except (AttributeError, ValueError) as e:
+    raise Exception("""Can't find STREAMBLOCKS_MODELS: wrong "STREAMFIELD_STREAMBLOCKS_APP_PATH" or STREAMBLOCKS_MODELS don't exist.""")
 
 class StreamBlocksAdmin(admin.ModelAdmin):
     change_form_template = 'streamfield/admin/change_form.html'

streamfield/base.py

@@ -2,6 +2,7 @@
 from django.contrib.admin import ModelAdmin, site
 from django.forms import ModelForm
 from django.utils.functional import cached_property
+from django.utils.html import format_html_join
 from django.template import loader
 from django.utils.safestring import mark_safe
 

streamfield/settings.py

@@ -3,10 +3,3 @@
 from django.conf import settings
 
 BLOCK_OPTIONS = getattr(settings, "STREAMFIELD_BLOCK_OPTIONS", {})
-STREAMBLOCKS_APP_PATH = getattr(settings, "STREAMFIELD_STREAMBLOCKS_APP_PATH", "streamblocks")
-
-try:
-    streamblocks_app = import_module("%s.models" % STREAMBLOCKS_APP_PATH)
-    STREAMBLOCKS_MODELS = streamblocks_app.STREAMBLOCKS_MODELS
-except (AttributeError, ValueError) as e:
-    raise Exception("""Can't find STREAMBLOCKS_MODELS: wrong "STREAMFIELD_STREAMBLOCKS_APP_PATH" or STREAMBLOCKS_MODELS don't exist.""")

streamfield/static/streamfield/css/streamfield_widget.css

@@ -107,6 +107,13 @@
     font-weight: bold;
 }
 
+.streamfield_app .block-fields svg,
+.streamfield_app .block-fields img
+{
+    max-width: 150px;
+    max-height: 150px;
+}
+
 .streamfield_app .stream-model-subblock {
     background: #e0e7eb;
     padding: 10px;

streamfield/urls.py

@@ -1,7 +1,15 @@
+from importlib import import_module
 from django.urls import include, path
+from django.conf import settings
 
 from . import views
-from .settings import STREAMBLOCKS_MODELS
+
+STREAMBLOCKS_APP_PATH = getattr(settings, "STREAMFIELD_STREAMBLOCKS_APP_PATH", "streamblocks")
+try:
+    streamblocks_app = import_module("%s.models" % STREAMBLOCKS_APP_PATH)
+    STREAMBLOCKS_MODELS = streamblocks_app.STREAMBLOCKS_MODELS
+except (AttributeError, ValueError) as e:
+    raise Exception("""Can't find STREAMBLOCKS_MODELS: wrong "STREAMFIELD_STREAMBLOCKS_APP_PATH" or STREAMBLOCKS_MODELS don't exist.""")
 
 admin_instance_urls = []