back to template paths as options and block option update options from settings changed to 'extra_options'

Author: raagin

README.md

@@ -108,6 +108,15 @@ and will be a list of objects if there is.
 </ul>
 ```
 
+> Note: You may use also `block_template` option. For specify a block template file.
+
+```python
+class RichText(models.Model):
+    ...
+    block_template = "streamblocks/richtext.html"
+    ...
+```
+
 **4. Add apps to settings.py**
 
 Add to INSTALLED_APPS
@@ -198,6 +207,15 @@ As context use "form":
 ```html
 {{ form.text.value }}
 ```
+
+You may also specify custom template as option:
+```python
+class RichText(models.Model):
+    ...
+    custom_admin_template = "streamblocks/admin/richtext.html"
+    ...
+```
+
 ### Override how to render block's fields in admin
 Create custom template for field with name as lowercased field widget name, and put it inside `.../streamblocks/admin/fields/` folder.
 
@@ -275,6 +293,22 @@ In page admin you will see it on the bottom of this block.
 > Note: Now only "checkbox" and "select" type is working.
 You may apply options for all blocks with `STREAMFIELD_BLOCK_OPTIONS` (See [Settings](#settings))
 
+If you want to add block options to options, which was set in django settings, you may use `extra_options`.
+```python
+class Slide(models.Model):
+    ...
+    extra_options = {
+        "autoplay": {
+            "label": "Autoplay",
+            "type": "checkbox",
+            "default": False
+        }
+    }
+    ...
+```
+
+If you want to switch off options, which set in django settings, for current block. Set `options={}`
+
 ## Special cases
 ### Complex Blocks
 You may use StreamField as part of blocks and create with that way complex structure

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="django-streamfield",
-    version="1.1.4",
+    version="1.2.0",
     author="Yury Lapshinov",
     author_email="y.raagin@gmail.com",
     description="StreamField for native Django Admin or with Grappelli",

streamfield/__init__.py

@@ -1,2 +1,2 @@
 name = "streamfield"
-VERSION = '1.1.4'
+VERSION = '1.2.0'

streamfield/base.py

@@ -118,7 +118,11 @@ def to_json(self):
 
 
 def _get_render_data(model_class, model_str, content, ctx):
-    block_tmpl = 'streamblocks/%s.html' % model_str.lower()
+    if hasattr(model_class, 'block_template'):
+        block_tmpl = model_class.block_template
+    else:
+        block_tmpl = 'streamblocks/%s.html' % model_str.lower()
+    print(block_tmpl)
     try:
         t = loader.get_template(block_tmpl)
     except loader.TemplateDoesNotExist:

streamfield/fields.py

@@ -18,10 +18,10 @@ def __init__(self, attrs=None):
         for block in self.model_list:
             as_list = hasattr(block, "as_list") and block.as_list
 
-            options = BLOCK_OPTIONS
-            if hasattr(block, "options"):
+            options = block.options if hasattr(block, "options") else BLOCK_OPTIONS
+            if hasattr(block, "extra_options"):
                 options = deepcopy(options)
-                options.update(block.options)
+                options.update(block.extra_options)
 
             model_doc = block._meta.verbose_name_plural if as_list else block._meta.verbose_name
             model_list_info[block.__name__] = {

streamfield/views.py

@@ -4,21 +4,14 @@
 from .forms import get_form_class
 
 def admin_instance_class(model, base=DetailView):
-
-    tmpl = loader.select_template([
-        'streamblocks/admin/%s.html' % model.__name__.lower(),
-        'streamfield/admin/change_form_render_template.html'
-        ])
-
-    # will be removed in future. use above approach to override admin template.
+    
     if hasattr(model, 'custom_admin_template'):
         tmpl_name = model.custom_admin_template
-        import warnings
-        warnings.warn(
-            "'custom_admin_template' will be removed in future. "
-            "Use override admin template approach instead", 
-            DeprecationWarning, stacklevel=2)
     else:
+        tmpl = loader.select_template([
+            'streamblocks/admin/%s.html' % model.__name__.lower(),
+            'streamfield/admin/change_form_render_template.html'
+        ])
         tmpl_name = tmpl.template.name
 
     def get_context_data(self, **kwargs):