diff --git a/GeneralApp/admin.py b/GeneralApp/admin.py index 5e26824..de74866 100644 --- a/GeneralApp/admin.py +++ b/GeneralApp/admin.py @@ -140,6 +140,10 @@ admin.site.register(StaticPage,Admin_StaticPage) class Admin_Block(Admin_Trans_BaseModelViewPage): + def formfield_for_dbfield(self, db_field, request, **kwargs): + field = super(Admin_Block, self).formfield_for_dbfield(db_field, request, **kwargs) + return sets_for_formfield_for_dbfield(field, db_field) + def obj_name(self, obj): try: return obj.content_object @@ -155,8 +159,10 @@ class Admin_Block(Admin_Trans_BaseModelViewPage): ('block_type', # 'title', 'name', 'description'), - ('picture', 'video_url'), - ('bg_color', 'bg_image', 'bg_video_url'), + ('picture',), + ('video_url',), + ('bg_color', 'bg_image'), + # ('bg_video_url', ), ('but_title', 'but_color', 'but_icon'), ('url',), ( diff --git a/templates/pages/page_schemes/ps_projecting.html b/templates/pages/page_schemes/ps_projecting.html index 3578cc6..f70a0ea 100644 --- a/templates/pages/page_schemes/ps_projecting.html +++ b/templates/pages/page_schemes/ps_projecting.html @@ -1,9 +1,8 @@ {% include 'blocks/b_services_3cols_w_groups.html' %} +{% include "pages/content/c_blocks_constructor.html" %} {% if page.plugin_presentation.all %} {% include 'blocks/b_3d_s_d.html' with block=page.plugin_presentation.all.0 %} -{% endif %} - -{% include "pages/content/c_blocks_constructor.html" %} \ No newline at end of file +{% endif %} \ No newline at end of file diff --git a/templates/pages/page_schemes/ps_services.html b/templates/pages/page_schemes/ps_services.html index 9e86588..9423f39 100644 --- a/templates/pages/page_schemes/ps_services.html +++ b/templates/pages/page_schemes/ps_services.html @@ -1,9 +1,8 @@ {% include 'blocks/b_services_2_col_wo_group.html' %} +{% include "pages/content/c_blocks_constructor.html" %} {% if page.plugin_presentation.all %} {% include 'blocks/b_3d_s_d.html' with block=page.plugin_presentation.all.0 %} -{% endif %} - -{% include "pages/content/c_blocks_constructor.html" %} \ No newline at end of file +{% endif %} \ No newline at end of file