From 389b7b2683a316ce4766e10e5998d7e4e8ba2403 Mon Sep 17 00:00:00 2001 From: SDE Date: Fri, 8 Dec 2023 19:26:01 +0300 Subject: [PATCH 1/4] 0.1.4 hide bg_video_url --- GeneralApp/admin.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/GeneralApp/admin.py b/GeneralApp/admin.py index 5e26824..f0efd36 100644 --- a/GeneralApp/admin.py +++ b/GeneralApp/admin.py @@ -155,8 +155,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',), ( From bab787032ad4363fe0c812fecbc7acc50366a789 Mon Sep 17 00:00:00 2001 From: SDE Date: Fri, 8 Dec 2023 19:27:30 +0300 Subject: [PATCH 2/4] 0.1.5 hide bg_video_url --- GeneralApp/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GeneralApp/admin.py b/GeneralApp/admin.py index f0efd36..47ae4f4 100644 --- a/GeneralApp/admin.py +++ b/GeneralApp/admin.py @@ -158,7 +158,7 @@ class Admin_Block(Admin_Trans_BaseModelViewPage): ('picture',), ('video_url',), ('bg_color', 'bg_image'), - ('bg_video_url', ), + # ('bg_video_url', ), ('but_title', 'but_color', 'but_icon'), ('url',), ( From d7964c03da913c6533f1abe658f5945577175f9a Mon Sep 17 00:00:00 2001 From: SDE Date: Fri, 8 Dec 2023 19:29:26 +0300 Subject: [PATCH 3/4] 0.1.6 hide bg_video_url --- GeneralApp/admin.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/GeneralApp/admin.py b/GeneralApp/admin.py index 47ae4f4..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 From 2f54a6dfc67bbfdd281c00caee3aa675c2eaa730 Mon Sep 17 00:00:00 2001 From: SDE Date: Fri, 8 Dec 2023 19:32:28 +0300 Subject: [PATCH 4/4] 0.1.7 chang order blocks on pages --- templates/pages/page_schemes/ps_projecting.html | 5 ++--- templates/pages/page_schemes/ps_services.html | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) 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