|
|
|
@ -129,15 +129,15 @@ from exposition.models import Exposition |
|
|
|
from conference.models import Conference |
|
|
|
from conference.models import Conference |
|
|
|
|
|
|
|
|
|
|
|
class ServiceControlForm(forms.Form): |
|
|
|
class ServiceControlForm(forms.Form): |
|
|
|
event = [{'verbose': 'Выставки', 'model': Exposition, 'id': 1}, |
|
|
|
event = [{'verbose': 'Выставки', 'model': Exposition, 'id': 1, 'service_bit': 'expo'}, |
|
|
|
{'verbose': 'Конференции', 'model': Conference, 'id': 2}] |
|
|
|
{'verbose': 'Конференции', 'model': Conference, 'id': 2, 'service_bit': 'conference'}] |
|
|
|
region = forms.ChoiceField(required=False, label='Регион', |
|
|
|
region = forms.ChoiceField(required=False, label='Регион', |
|
|
|
choices=[('', '')]+[(item.id, item.name) |
|
|
|
choices=[('', '')]+[(item.id, item.name) |
|
|
|
for item in list(Area.objects.all())]) |
|
|
|
for item in list(Area.objects.all())]) |
|
|
|
country = forms.MultipleChoiceField(required=False, label='Страны', |
|
|
|
country = forms.MultipleChoiceField(required=False, label='Страны', |
|
|
|
choices=[('', '')]+[(item.id, item.name) |
|
|
|
choices=[('', '')]+[(item.id, item.name) |
|
|
|
for item in list(Country.objects.all())]) |
|
|
|
for item in list(Country.objects.all())]) |
|
|
|
country_all = forms.BooleanField() |
|
|
|
country_all = forms.BooleanField(required=False) |
|
|
|
expositions = forms.CharField(label=u'Выставки', widget=forms.HiddenInput(), required=False) |
|
|
|
expositions = forms.CharField(label=u'Выставки', widget=forms.HiddenInput(), required=False) |
|
|
|
conferences = forms.CharField(label=u'Конференции', widget=forms.HiddenInput(), required=False) |
|
|
|
conferences = forms.CharField(label=u'Конференции', widget=forms.HiddenInput(), required=False) |
|
|
|
|
|
|
|
|
|
|
|
@ -145,5 +145,5 @@ class ServiceControlForm(forms.Form): |
|
|
|
super(ServiceControlForm, self).__init__(*args, **kwargs) |
|
|
|
super(ServiceControlForm, self).__init__(*args, **kwargs) |
|
|
|
self.fields['event_type'] = forms.MultipleChoiceField(required=False, label = 'Тип события', |
|
|
|
self.fields['event_type'] = forms.MultipleChoiceField(required=False, label = 'Тип события', |
|
|
|
widget=forms.CheckboxSelectMultiple(), |
|
|
|
widget=forms.CheckboxSelectMultiple(), |
|
|
|
choices=[(item['id'], item['verbose']) |
|
|
|
choices=[(item['service_bit'], item['verbose']) |
|
|
|
for item in self.event]) |
|
|
|
for item in self.event]) |