From a9d65d8fc0984c0a7263969be8e34fc5fb954a7e Mon Sep 17 00:00:00 2001 From: Slava Kyrachevsky Date: Wed, 1 Feb 2017 13:27:11 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=83=D1=81=D0=BB=D1=83=D0=B3=20=D1=83=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/conference/forms.py | 3 +++ apps/conference/models.py | 12 +++++++++++- apps/conference/signals.py | 6 ------ apps/exposition/models.py | 12 +++++++++++- apps/exposition/signals.py | 6 ------ templates/c_admin/conference/conference.html | 7 +++++++ 6 files changed, 32 insertions(+), 14 deletions(-) delete mode 100644 apps/conference/signals.py delete mode 100644 apps/exposition/signals.py diff --git a/apps/conference/forms.py b/apps/conference/forms.py index 3cdb0d39..8cf6ff62 100644 --- a/apps/conference/forms.py +++ b/apps/conference/forms.py @@ -6,6 +6,7 @@ from django.forms.util import ErrorList from django.core.validators import validate_email, URLValidator from django.utils.translation import ugettext as _ #models +from .models import flags as FLAGS from events.models import TargetAudience from models import Conference, TimeTable, CURRENCY, Statistic, BIT_AUDIENCE, Speaker from country.models import Country @@ -24,6 +25,8 @@ from functions.form_check import translit_with_separator from functions.admin_forms import AdminFilterForm, EventsAdminFilterFormMixin from functions.forms import ML_ModelMultipleChoiceField +from bitfield.forms import BitFieldCheckboxSelectMultiple + places = [(item.id, item.name) for item in PlaceConference.objects.language().all()] places.insert(0,('', 'Не выбрано')) diff --git a/apps/conference/models.py b/apps/conference/models.py index 72be39fb..654bd0fa 100644 --- a/apps/conference/models.py +++ b/apps/conference/models.py @@ -8,6 +8,7 @@ from django.core.urlresolvers import reverse_lazy from django.db import models from django.db.models import Q from django.db.models.signals import post_save, pre_save +from django.dispatch import receiver from django.utils import translation from django.utils.translation import ugettext as _ @@ -23,7 +24,7 @@ from functions.translate import fill_with_signal from functions.files import gen_path from hvad.models import TranslatableModel, TranslatedFields, TranslationManager from photologue.models import Gallery -from service.models import Service +from service.models import Service, LinkedService from events.common import MEMBERS, VISITORS, PRICE, PRICE_EUR from events.models import TargetAudience @@ -296,3 +297,12 @@ pre_save.connect(pre_save_handler, sender=Conference) post_save.connect(post_save_handler, sender=Conference) post_save.connect(post_save_handler, sender=TimeTable) post_save.connect(post_save_handler, sender=Statistic) + + +@receiver(post_save, sender=Conference) +def conference_services_handler(sender, instance, **kwargs): + """ + При сохранении конференции сохраняем данные по услугам + """ + for service in LinkedService.objects.all(): + service.update_all_flags() diff --git a/apps/conference/signals.py b/apps/conference/signals.py deleted file mode 100644 index 59e8479f..00000000 --- a/apps/conference/signals.py +++ /dev/null @@ -1,6 +0,0 @@ -# -*- coding: utf-8 -*- -from django.db.models.signals import post_save -from models import Conference -from functions.signal_handlers import post_save_handler - -#post_save.connect(post_save_handler, sender=Conference) diff --git a/apps/exposition/models.py b/apps/exposition/models.py index 3598fe7d..22c54869 100644 --- a/apps/exposition/models.py +++ b/apps/exposition/models.py @@ -10,6 +10,7 @@ from django.core.urlresolvers import reverse_lazy from django.db import models from django.db.models import Q from django.db.models.signals import post_save, pre_save +from django.dispatch import receiver from django.utils import translation from django.utils.translation import ugettext as _ from functions.custom_fields import EnumField @@ -21,7 +22,7 @@ from hvad.models import TranslatableModel, TranslatedFields, TranslationManager from import_xls.model_utils import ExpoImportManager from manager import ClientManager from organiser.models import Organiser -from service.models import Service +from service.models import Service, LinkedService from events.common import MEMBERS, VISITORS, PRICE, PRICE_EUR @@ -363,3 +364,12 @@ post_save.connect(post_save_handler, sender=Exposition) post_save.connect(post_save_handler, sender=TimeTable) post_save.connect(post_save_handler, sender=TmpTimeTable) post_save.connect(post_save_handler, sender=Statistic) + + +@receiver(post_save, sender=Exposition) +def exposition_services_handler(sender, instance, **kwargs): + """ + При сохранении выставки сохраняем данные по услугам + """ + for service in LinkedService.objects.all(): + service.update_all_flags() diff --git a/apps/exposition/signals.py b/apps/exposition/signals.py deleted file mode 100644 index 6b7ad132..00000000 --- a/apps/exposition/signals.py +++ /dev/null @@ -1,6 +0,0 @@ -# -*- coding: utf-8 -*- -from django.db.models.signals import post_save -from models import Exposition -from functions.signal_handlers import post_save_handler - -#post_save.connect(post_save_handler, sender=Exposition) diff --git a/templates/c_admin/conference/conference.html b/templates/c_admin/conference/conference.html index 94b9543f..1fa1fed4 100644 --- a/templates/c_admin/conference/conference.html +++ b/templates/c_admin/conference/conference.html @@ -152,6 +152,13 @@ {{ form.audience.errors }} + {# services #} +
+ +
{{ form.services }} + {{ form.services.errors }} +
+
{# country #}
From 0f1ef887fead0d76503a04ddf59ec5b835e6d43f Mon Sep 17 00:00:00 2001 From: Slava Kyrachevsky Date: Wed, 1 Feb 2017 16:27:47 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20datetimepicker=20=D0=B2=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD?= =?UTF-8?q?=D0=BA=D0=B5=20=D0=B2=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80?= =?UTF-8?q?=D0=B5=20=D0=B5=D0=B6=D0=B5=D0=B4=D0=BD=D0=B5=D0=B2=D0=BD=D0=BE?= =?UTF-8?q?=D0=B9=20=D1=81=D1=82=D0=B0=D1=82=D0=B8=D1=81=D1=82=D0=B8=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../c_admin/newsletters/newsletter_list_daily.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/templates/c_admin/newsletters/newsletter_list_daily.html b/templates/c_admin/newsletters/newsletter_list_daily.html index faa7aa50..40023fe7 100644 --- a/templates/c_admin/newsletters/newsletter_list_daily.html +++ b/templates/c_admin/newsletters/newsletter_list_daily.html @@ -72,5 +72,13 @@ {# pagination #} {% include 'c_admin/includes/admin_pagination.html' with page_obj=page_obj %}
- + {% endblock %}