From 88e67ab30641a67141d1d40caee17672da7d6a33 Mon Sep 17 00:00:00 2001 From: SDE Date: Mon, 11 Dec 2023 23:32:28 +0300 Subject: [PATCH] 0.4.12 prepare form wo descr --- GeneralApp/forms.py | 12 +++++++++++- GeneralApp/funcs.py | 14 ++++++++++++-- templates/widgets/elements_form_feedback.html | 3 ++- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/GeneralApp/forms.py b/GeneralApp/forms.py index 4dbda2b..450c404 100644 --- a/GeneralApp/forms.py +++ b/GeneralApp/forms.py @@ -19,4 +19,14 @@ class FeedbackForm(forms.Form): agreement = forms.BooleanField( label=_('Принимаю пользовательское соглашение и принимаю условия обработки личных данных'), initial=False, required=True - ) \ No newline at end of file + ) + + def __init__(self, *args, **kwargs): + del_descr = False + if (kwargs and 'del_descr' in kwargs and kwargs['del_descr']) or (not 'desription' in kwargs['data']): + del_descr = True + if 'del_descr' in kwargs: + del kwargs['del_descr'] + super(FeedbackForm, self).__init__(*args, **kwargs) + if del_descr: + del self.fields['description'] diff --git a/GeneralApp/funcs.py b/GeneralApp/funcs.py index 66118fe..e41143a 100644 --- a/GeneralApp/funcs.py +++ b/GeneralApp/funcs.py @@ -13,20 +13,30 @@ def get_inter_Dict(user, context_Dict): from ServicesApp.funcs import get_sections sections = get_sections() + page = None + page_scheme = None + hide_form_field_description = False if 'page' in context_Dict and context_Dict['page']: - fb_block = context_Dict['page'].get_feedback_block() + page = context_Dict['page'] + page_scheme = getattr(page, 'page_scheme', None) + + fb_block = page.get_feedback_block() if fb_block: form_name = fb_block.name if form_name: + kwargs_form = {} from .forms import FeedbackForm - feedback_form = FeedbackForm() + if page_scheme and page_scheme == 'plugin': + kwargs_form.update({'del_descr': True}) + feedback_form = FeedbackForm(**kwargs_form) feedback_form.initial = {'form_name': form_name} Dict.update({'feedback_form': feedback_form}) Dict.update({ 'sections': sections, 'logo': get_logo_url(), + 'hide_form_field_description': hide_form_field_description }) # from SubscribesApp.funcs import get_cur_user_subscribe # user_subscribe = get_cur_user_subscribe(user) diff --git a/templates/widgets/elements_form_feedback.html b/templates/widgets/elements_form_feedback.html index 4764da1..8a8759f 100644 --- a/templates/widgets/elements_form_feedback.html +++ b/templates/widgets/elements_form_feedback.html @@ -12,7 +12,8 @@ {% if feedback_form.errors.contacts %}
{{ feedback_form.errors.contacts }}
{% endif %} -{% if not page.page_scheme == 'plugin' %} + +{% if feedback_form.fields.description %}