sysadminix/Aerbim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
SBD
2023-12-09 22:01:14 +03:00
parent 4d6abd08ba d60a687052
commit f6fab81159
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
GeneralApp/admin.py
View File

@@ -187,6 +187,7 @@ class Admin_Block(Admin_Trans_BaseModelViewPage):
list_editable = ['enable', 'order'] list_editable = ['enable', 'order']
search_fields = ['name'] search_fields = ['name']
list_filter = ['enable', 'content_type', 'block_type'] list_filter = ['enable', 'content_type', 'block_type']
ordering = ['content_type', 'object_id', 'order']
def has_delete_permission(self, request, obj=None): def has_delete_permission(self, request, obj=None):
if request.user.is_superuser: if request.user.is_superuser:
@@ -279,8 +280,9 @@ class Admin_Office(Admin_Trans_BaseModelViewPage):
'modifiedDT', 'createDT' 'modifiedDT', 'createDT'
] ]
list_editable = [ list_editable = [
'work_time_from', 'work_time_to', # 'work_time_from', 'work_time_to',
# 'main_office', # 'main_office',
'enable',
'order' 'order'
] ]
list_display_links = ['id', 'city', 'address'] list_display_links = ['id', 'city', 'address']

33
templates/pages/content/c_section_content.html
View File

@@ -2,22 +2,25 @@
{% include 'blocks/dynamic/b_sections_buttons.html' %} {% include 'blocks/dynamic/b_sections_buttons.html' %}
<div class="cut-width"> {% if page.description or page.title or page.text %}
<div style="padding-top: 40px;"> <div {% include "block_settings/blocks_settings.html" %}>
{% if page.description or page.title or page.text %} <div class="cut-width">
<div>
{% if page.description %}
<div class="description_page standart_txt">{{ page.description }}</div> {% if page.description %}
{% endif %} <div class="description_page standart_txt">{{ page.description }}</div>
{% if page.title %} {% endif %}
<div class="title_page standart_txt">{{ page.title }}</div> {% if page.title %}
{% endif %} <div class="title_page standart_txt">{{ page.title }}</div>
{% if page.text %} {% endif %}
<div class="title_page standart_txt">{{ page.text|safe }}</div> {% if page.text %}
{% endif %} <div class="title_page standart_txt">{{ page.text|safe }}</div>
{% endif %} {% endif %}
</div>
</div>
</div> </div>
</div> {% endif %}
{% if page.page_scheme == 'projecting' %} {% if page.page_scheme == 'projecting' %}
{% include "pages/page_schemes/ps_projecting.html" %} {% include "pages/page_schemes/ps_projecting.html" %}