From db7a8f271597a34258e20d9e37ce3e31b0f697f9 Mon Sep 17 00:00:00 2001 From: Nazar Kotjuk Date: Fri, 9 Oct 2015 11:56:49 +0300 Subject: [PATCH 1/8] Linked services fixing --- exposition/models.py | 7 +++++++ service/admin_urls.py | 10 +++++----- service/models.py | 9 +++++++++ .../admin/service/linked_service_list.html | 12 +++++------- .../exposition/exposition_services.html | 17 +++++++---------- 5 files changed, 33 insertions(+), 22 deletions(-) diff --git a/exposition/models.py b/exposition/models.py index 8a38e1a9..f8a652bb 100644 --- a/exposition/models.py +++ b/exposition/models.py @@ -178,6 +178,13 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): return list(qs) + def get_services_detail(self): + excluded = ['visit', 'tickets'] + country_ids = [item for item, bool in self.country.services if bool==True] + ids = [item for item, bool in self.services if bool==True] + qs = Service.objects.language().exclude(url__in=excluded).filter(Q(Q(url__in=country_ids) & Q(type=Service.type.expo)) | Q(url__in=ids)) + return qs + def get_parent(self): return {} def get_absolute_url(self): diff --git a/service/admin_urls.py b/service/admin_urls.py index f1816405..4b025595 100644 --- a/service/admin_urls.py +++ b/service/admin_urls.py @@ -5,8 +5,8 @@ from views import CallBackListView, VisitListView, TranslationListView, Advertis from service.admin import ServiceControlList, ServiceControl, LinkedServiceList, LinkedServiceUpdateView, LinkedServiceDeleteView urlpatterns = patterns('service.admin', - url(r'^control/list/$', ServiceControlList.as_view()), - url(r'^control/(?P.*)/$', ServiceControl.as_view()), + #url(r'^control/list/$', ServiceControlList.as_view()), + #url(r'^control/(?P.*)/$', ServiceControl.as_view()), url(r'^add.*/$', 'service_add'), url(r'^delete/(?P.*)/$', 'service_delete'), url(r'^change/(?P.*)/$', 'service_change'), @@ -18,9 +18,9 @@ urlpatterns = patterns('service.admin', url(r'order/participation/$', ParticipationListView.as_view()), url(r'order/remote/$', RemoteListView.as_view()), url(r'order/tickets/$', TicketsListView.as_view()), - url('^test/delete/(?P[a-z]*)/', LinkedServiceDeleteView.as_view(), name='linked_service_delete'), - url('^test/all/', LinkedServiceList.as_view(), name = 'linked_service_all'), - url('^test/(?P[a-z]*)/', LinkedServiceUpdateView.as_view(), name= 'linked_service_update'), + url(r'^control/delete/(?P[a-z]*)/', LinkedServiceDeleteView.as_view(), name='linked_service_delete'), + url(r'^control/all/', LinkedServiceList.as_view(), name = 'linked_service_all'), + url(r'^control/(?P[a-z]*)/', LinkedServiceUpdateView.as_view(), name= 'linked_service_update'), #ajax url(r'^get_city/$', 'get_city'), diff --git a/service/models.py b/service/models.py index 4549f10e..471bc6fa 100644 --- a/service/models.py +++ b/service/models.py @@ -238,5 +238,14 @@ class LinkedService(models.Model): self.update_expositions_flag() self.update_conferences_flag() + def countries_count(self): + if not self.exclude_countries: + return self.countries.all().count() + else: + from country.models import Country + all = Country.objects.filter().count() + excluded = self.countries.all().count() + return all - excluded + def __unicode__(self): return u'Linked service for %s'%self.service.url diff --git a/templates/admin/service/linked_service_list.html b/templates/admin/service/linked_service_list.html index eb4af0cb..4d656474 100644 --- a/templates/admin/service/linked_service_list.html +++ b/templates/admin/service/linked_service_list.html @@ -2,7 +2,7 @@ {% block body %} -
+

Настройки услуг

@@ -25,17 +25,15 @@ {{ item.id }} {{ item.service.name }} - {% if item.service.type.mask == 1 %} expo {% elif item.service.type.mask == 2%} conf {% elif item.service.type.mask == 3 %} expo, conf{% endif %} - {{ item.countries.count }} + {% if item.service.type.mask == 1 %} выставки {% elif item.service.type.mask == 2%} конференции {% elif item.service.type.mask == 3 %} выставки и конференции{% endif %} + {{ item.countries_count }} {{ item.expositions.count }} {{ item.conferences.count }} - Изменить - - - Удалить + Управление + {% endfor %} diff --git a/templates/client/includes/exposition/exposition_services.html b/templates/client/includes/exposition/exposition_services.html index 5e9b936f..b98f4d71 100644 --- a/templates/client/includes/exposition/exposition_services.html +++ b/templates/client/includes/exposition/exposition_services.html @@ -2,15 +2,12 @@
\ No newline at end of file From 114868dee3ccb04cf56e9aa96ade9bcaa14148f5 Mon Sep 17 00:00:00 2001 From: Ivan Kovalkovskyi Date: Fri, 9 Oct 2015 12:04:00 +0300 Subject: [PATCH 2/8] linked service bug fix --- service/admin.py | 9 +++++++-- service/forms.py | 4 +++- templates/admin/service/linked_service.html | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/service/admin.py b/service/admin.py index d91251fb..16bb9707 100644 --- a/service/admin.py +++ b/service/admin.py @@ -178,10 +178,15 @@ class LinkedServiceUpdateView(UpdateView): return self.success_url def form_valid(self, form): - self.object = form.save() - self.object.update_all_flags() + obj = form.save() + obj.countries = form.cleaned_data['countries'] + obj.expositions = form.cleaned_data['expositions'] + obj.conferences = form.cleaned_data['conferences'] + obj.save() + obj.update_all_flags() return HttpResponseRedirect(self.get_success_url()) + class LinkedServiceList(ListView): model = LinkedService template_name = 'admin/service/linked_service_list.html' diff --git a/service/forms.py b/service/forms.py index fa84b396..95460a5b 100644 --- a/service/forms.py +++ b/service/forms.py @@ -157,6 +157,7 @@ class LinkedServiceForm(forms.ModelForm): type = forms.MultipleChoiceField(choices = [(x, x) for x in list(Service.type)], widget = forms.CheckboxSelectMultiple, required=False) expositions = forms.CharField(widget=forms.HiddenInput,required=False) conferences = forms.CharField(widget=forms.HiddenInput, required=False) + countries = forms.MultipleChoiceField(choices=[(c.id, c.name) for c in list(set(Country.objects.language()))]) class Meta: model = LinkedService @@ -166,7 +167,8 @@ class LinkedServiceForm(forms.ModelForm): } def clean_countries(self): - return list(set(self.cleaned_data.get('countries'))) + countries = Country.objects.language().filter(id__in=self.cleaned_data['countries']) + return countries def clean_expositions(self): expositions = EmptyQuerySet() diff --git a/templates/admin/service/linked_service.html b/templates/admin/service/linked_service.html index 3ecb4f54..38908896 100644 --- a/templates/admin/service/linked_service.html +++ b/templates/admin/service/linked_service.html @@ -15,6 +15,7 @@ - @@ -15,25 +14,27 @@ {% block body %} -
{% csrf_token %}{{ form.errors }} + {% csrf_token %}
- {% if object %} Изменить {% else %} Добавить {% endif %}тему + {% if theme_id %} Изменить {% else %} Добавить {% endif %}тему

Информация

- {% for field in form %} - - - - {% endfor %} + {# name #} + {% with field='name' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} + + {# main_title #} + {% with field='main_title' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %} + {# description #} + {% with field='description' form=form languages=languages %} + {% include 'admin/forms/multilang.html' %} + {% endwith %}
diff --git a/theme/admin.py b/theme/admin.py index 8914587f..d2288161 100644 --- a/theme/admin.py +++ b/theme/admin.py @@ -182,13 +182,46 @@ class ThemeBlogListView(ListView): paginate_by = settings.ADMIN_PAGINATION -class ThemeBlogCreateView(CreateView): - template_name = "admin/theme/theme_blog_new.html" +class ThemeBlogDeleteView(DeleteView): + template_name = "admin/theme/theme_blog_confirm_delete.html" model = ThemeBlog - form_class = ThemeBlogForm success_url = reverse_lazy("theme_blog_all") + pk_url_kwarg = "theme_id" + +def blog_theme_add(request): + return add_object(request, ThemeBlogForm, 'theme_blog_new.html', reverse_lazy("theme_blog_all")) +@login_required +def blog_theme_change(request, theme_id=None): + try: + theme = ThemeBlog.objects.get(id=theme_id) + except: + return HttpResponseRedirect('theme_blog_all') + if request.POST: + form = ThemeBlogForm(request.POST) + if form.is_valid(): + form.save(theme_id) + return HttpResponseRedirect(reverse_lazy("theme_blog_all")) + else: + data = {} + for code, name in settings.LANGUAGES: + obj = ThemeBlog._meta.translations_model.objects.get(language_code = code,master__id=theme_id) #access to translated fields + data['name_%s'%code] = obj.name + data['description_%s'%code] = obj.description + data['main_title_%s'%code] = obj.main_title + form = ThemeBlogForm(data) + args = {} + args.update(csrf(request)) + args['form'] = form + args['languages'] = settings.LANGUAGES + args['theme_id'] = theme_id + + return render_to_response('admin/theme/theme_blog_new.html', args) + + + +# ====================================================== class ThemeBlogUpdateView(UpdateView): template_name = "admin/theme/theme_blog_new.html" model = ThemeBlog @@ -197,8 +230,8 @@ class ThemeBlogUpdateView(UpdateView): pk_url_kwarg = "theme_id" -class ThemeBlogDeleteView(DeleteView): - template_name = "admin/theme/theme_blog_confirm_delete.html" +class ThemeBlogCreateView(CreateView): + template_name = "admin/theme/theme_blog_new.html" model = ThemeBlog - success_url = reverse_lazy("theme_blog_all") - pk_url_kwarg = "theme_id" + form_class = ThemeBlogForm + success_url = reverse_lazy("theme_blog_all") \ No newline at end of file diff --git a/theme/admin_urls.py b/theme/admin_urls.py index 0caf5c87..423c6dc4 100644 --- a/theme/admin_urls.py +++ b/theme/admin_urls.py @@ -7,12 +7,12 @@ from .admin import ThemeBlogCreateView, ThemeBlogUpdateView, ThemeBlogDeleteView urlpatterns = patterns('theme.admin', url(r'^theme/add.*/$', 'theme_add'), url(r'^tag/add.*/$', 'tag_add'), - url(r'^blog_theme/add/$', ThemeBlogCreateView.as_view(), name = 'theme_blog_new'), + url(r'^blog_theme/add/$', 'blog_theme_add', name = 'theme_blog_new'), url(r'^theme/delete/(?P\d+)/$', 'theme_delete'), url(r'^tag/delete/(?P\d+)/$', 'tag_delete'), url(r'^blog_theme/delete/(?P\d+)/$', ThemeBlogDeleteView.as_view(), name = 'theme_blog_delete'), url(r'^theme/change/(?P\d+).*/$', 'theme_change'), - url(r'^blog_theme/change/(?P\d+).*/$', ThemeBlogUpdateView.as_view(), name= "theme_blog_change"), + url(r'^blog_theme/change/(?P\d+).*/$', 'blog_theme_change', name= "theme_blog_change"), url(r'^tag/change/(?P\d+).*/$', 'tag_change'), url(r'^theme/copy/(?P\d+).*/$', 'theme_copy'), url(r'^tag/copy/(?P\d+).*/$', 'tag_copy'), diff --git a/theme/forms.py b/theme/forms.py index 5f166b04..7571a784 100644 --- a/theme/forms.py +++ b/theme/forms.py @@ -149,7 +149,7 @@ from hvad.forms import TranslatableModelForm from .models import ThemeBlog -class ThemeBlogForm(TranslatableModelForm): +class _ThemeBlogForm(TranslatableModelForm): class Meta: model = ThemeBlog fields = ['url', 'name', 'main_title', 'description', 'inflect'] @@ -158,4 +158,34 @@ class ThemeBlogForm(TranslatableModelForm): def save(self, commit= True): if not 'url' in self.cleaned_data: self.cleaned_data['url'] = translit_with_separator(self.cleaned_data['name']) - return super(ThemeBlogForm, self).save(commit=True) \ No newline at end of file + return super(_ThemeBlogForm, self).save(commit=True) + + +class ThemeBlogForm(forms.Form): + + def __init__(self, *args, **kwargs): + super(ThemeBlogForm, self).__init__(*args, **kwargs) + # creates translated form fields, example: name_ru, name_en + # len(10) is a hack for detect if settings.LANGUAGES is not configured it return all langs + if len(settings.LANGUAGES) in range(10): + for lid, (code, name) in enumerate(settings.LANGUAGES): + # using enumerate for detect iteration number + # first iteration is a default lang so it required fields + required = True if lid == 0 else False + self.fields['name_%s' % code] = forms.CharField(label='Название', required=required) + self.fields['main_title_%s' % code] = forms.CharField(label='Заголовок', required=required) + self.fields['description_%s' % code] = forms.CharField(label='Описание', required=False, widget=CKEditorWidget)#with saving form + + def save(self, id=None): + data = self.cleaned_data + if not id: + theme = ThemeBlog() + else: + theme = ThemeBlog.objects.get(id=id) + if not getattr(theme, 'url'): + theme.url = translit_with_separator(data['name_ru'].strip()).lower() + + fill_with_signal(ThemeBlog, theme, data) + if not theme.url: + theme.url = translit_with_separator(theme.name) + theme.save() diff --git a/theme/models.py b/theme/models.py index 93908fd7..dd01de1c 100644 --- a/theme/models.py +++ b/theme/models.py @@ -273,6 +273,7 @@ def pre_save_handler(sender, **kwargs): pre_save.connect(pre_save_handler, sender=Tag) post_save.connect(post_save_handler, sender=Theme) +post_save.connect(post_save_handler, sender=ThemeBlog) post_save.connect(post_save_handler, sender=Tag) From bc10a73aa23a01beaea656224a60d586412f0348 Mon Sep 17 00:00:00 2001 From: Ivan Kovalkovskyi Date: Tue, 13 Oct 2015 14:12:21 +0300 Subject: [PATCH 7/8] conference main page --- conference/models.py | 1 + expobanner/admin.py | 54 ++++++++++++++++++-- expobanner/admin_urls.py | 6 +++ expobanner/forms.py | 32 ++++++++++++ expobanner/models.py | 8 ++- templates/admin/expobanner/default_form.html | 2 +- templates/admin/expobanner/main_list.html | 23 +++++++-- templates/admin/expobanner/paid_create.html | 33 ++++++++++++ templates/admin/includes/admin_nav.html | 1 + 9 files changed, 149 insertions(+), 11 deletions(-) diff --git a/conference/models.py b/conference/models.py index 067371db..f1173103 100644 --- a/conference/models.py +++ b/conference/models.py @@ -111,6 +111,7 @@ class Conference(TranslatableModel, EventMixin, ExpoMixin): keywords=models.CharField(max_length=250), ) + main = models.ForeignKey('expobanner.MainPage', blank=True, null=True, on_delete=models.SET_NULL) #fields saves information about creating and changing model created = models.DateTimeField(auto_now_add=True) modified = models.DateTimeField(auto_now=True) diff --git a/expobanner/admin.py b/expobanner/admin.py index 4c053c53..30c528be 100644 --- a/expobanner/admin.py +++ b/expobanner/admin.py @@ -6,9 +6,9 @@ from django.shortcuts import get_object_or_404 from django.db.models import Sum from expobanner.models import URL, BannerGroup, Banner, Paid, MainPage, Top from expobanner.forms import UrlCreateForm, BannerCreateGroupForm, BannerCreateForm, BannerGroupUpdateForm,\ - PaidCreateForm, PaidUpdateForm, TopCreateForm, BannerLinkCreateForm, MainCreateForm, MainUpdateForm, TopUpdateForm + PaidCreateForm, PaidUpdateForm, TopCreateForm, BannerLinkCreateForm, MainCreateForm, MainConfCreateForm, MainUpdateForm, TopUpdateForm from exposition.models import Exposition - +from conference.models import Conference class BannersControl(TemplateView): template_name = 'admin/expobanner/banners_control.html' @@ -203,6 +203,8 @@ class PaidStat(DetailView): return context # ---------------------------------- + + class MainList(ListView): model = Exposition template_name = 'admin/expobanner/main_list.html' @@ -227,7 +229,6 @@ class MainUpdate(UpdateView): template_name = 'admin/expobanner/default_form.html' success_url = '/admin/expobanners/main/list/' - def get_context_data(self, **kwargs): context = super(MainUpdate, self).get_context_data(**kwargs) obj = self.object @@ -235,6 +236,50 @@ class MainUpdate(UpdateView): return context +class MainConfList(ListView): + model = Conference + template_name = 'admin/expobanner/main_list.html' + paginate_by = settings.ADMIN_PAGINATION + + def get_queryset(self): + qs = self.model.objects.language().filter(main__isnull=False).order_by('-main__public') + if self.request.GET.get('onlypublic'): + qs = qs.filter(main__public=True) + return qs + + def get_context_data(self, **kwargs): + context = super(MainConfList, self).get_context_data(**kwargs) + context.update({'conf': True}) + return context + + +from django.core.urlresolvers import reverse_lazy + + +class MainConfCreate(CreateView): + form_class = MainConfCreateForm + template_name = 'admin/expobanner/paid_create.html' + success_url = reverse_lazy('expobanner-conf-list_main') + + def get_context_data(self, **kwargs): + context = super(MainConfCreate, self).get_context_data(**kwargs) + context.update({'conf': True}) + return context + + +class MainConfUpdate(UpdateView): + model = MainPage + form_class = MainUpdateForm + template_name = 'admin/expobanner/default_form.html' + success_url = reverse_lazy('expobanner-conf-list_main') + + def get_context_data(self, **kwargs): + context = super(MainConfUpdate, self).get_context_data(**kwargs) + obj = self.object + context['conference'] = obj.get_event() + return context + + def main_turn(request, pk, status): main = get_object_or_404(MainPage, pk=pk) if status == 'on': @@ -242,10 +287,11 @@ def main_turn(request, pk, status): else: main.public = False main.save() - return HttpResponseRedirect('/admin/expobanners/main/list/') + return HttpResponseRedirect(request.META['HTTP_REFERER']) from datetime import datetime + class MainStat(DetailView): model = MainPage template_name = 'admin/expobanner/main_stat.html' diff --git a/expobanner/admin_urls.py b/expobanner/admin_urls.py index cce3e1aa..0c46fcd8 100644 --- a/expobanner/admin_urls.py +++ b/expobanner/admin_urls.py @@ -36,4 +36,10 @@ urlpatterns = patterns('expobanner.admin', url(r'^main/$', MainCreate.as_view(), name='expobanner-create_main'), url(r'^main/turn/(?P\d+)/(?P.*)/$', main_turn, name='expobanner-main-turn'), url(r'^main/(?P\d+)/stat/$', MainStat.as_view(), name='expobanner_stat_main'), + # conference on main page + url(r'^main/conf/list/$', MainConfList.as_view(), name='expobanner-conf-list_main'), + url(r'^main/conf/(?P\d+)/edit/$', MainConfUpdate.as_view(), name='expobanner-conf-update_main'), + url(r'^main/conf/$', MainConfCreate.as_view(), name='expobanner-conf-create_main'), + url(r'^main/conf/turn/(?P\d+)/(?P.*)/$', main_turn, name='expobanner-conf-main-turn'), + #url(r'^main/conf/(?P\d+)/stat/$', MainStat.as_view(), name='expobanner_stat_main'), ) \ No newline at end of file diff --git a/expobanner/forms.py b/expobanner/forms.py index 84d45965..a5a12179 100644 --- a/expobanner/forms.py +++ b/expobanner/forms.py @@ -2,6 +2,7 @@ from django import forms from expobanner.models import URL, BannerGroup, Banner, Paid, Top, MainPage from exposition.models import Exposition +from conference.models import Conference from country.models import Country from ckeditor.widgets import CKEditorWidget from theme.models import Theme, Tag @@ -107,6 +108,7 @@ class PaidCreateForm(forms.ModelForm): raise forms.ValidationError(u'Такой выставки не существует') return expo + class MainCreateForm(forms.ModelForm): verbose = u'Добавить выставку на главную' exposition = forms.CharField(label=u'Выставка', widget=forms.HiddenInput()) @@ -137,6 +139,36 @@ class MainCreateForm(forms.ModelForm): return expo +class MainConfCreateForm(forms.ModelForm): + verbose = u'Добавить конференцию на главную' + conf = forms.CharField(label=u'Конференция', widget=forms.HiddenInput()) + + class Meta: + model = MainPage + fields = ['position', 'public'] + + def save(self, commit=True): + main = super(MainConfCreateForm, self).save(commit=False) + if commit: + conf = self.cleaned_data['conf'] + link = conf.get_permanent_url() + link_b = Banner.objects.create_for_paid(conf, link, 'main_page_link') + main.link = link_b + main.save() + + conf.main = main + conf.save() + return main + + def clean_conf(self): + conf_id = self.cleaned_data['conf'] + try: + conf = Conference.objects.get(id=conf_id) + except Conference.DoesNotExist: + raise forms.ValidationError(u'Такой конференции не существует') + return conf + + class PaidUpdateForm(forms.ModelForm): tickets = forms.URLField(label=u'Линк на билеты') participation = forms.URLField(label=u'Линк на участие') diff --git a/expobanner/models.py b/expobanner/models.py index 2208fc9a..8a1afabd 100644 --- a/expobanner/models.py +++ b/expobanner/models.py @@ -297,7 +297,13 @@ class MainPage(models.Model, StatMixin): try: return self.exposition_set.all()[0] except IndexError: - return None + try: + return self.conference_set.all()[0] + except IndexError: + return None + + def __unicode__(self): + return self.get_event().url def generatePassword(length=5): diff --git a/templates/admin/expobanner/default_form.html b/templates/admin/expobanner/default_form.html index 3322088e..46a441d9 100644 --- a/templates/admin/expobanner/default_form.html +++ b/templates/admin/expobanner/default_form.html @@ -51,7 +51,7 @@
-

{{ form.verbose }}

+

{% if form.verbose %} {{ form.verbose }} {% else %} {{ object.get_event }} {% endif %}

{% for field in form %} diff --git a/templates/admin/expobanner/main_list.html b/templates/admin/expobanner/main_list.html index a06a2411..2af62ce8 100644 --- a/templates/admin/expobanner/main_list.html +++ b/templates/admin/expobanner/main_list.html @@ -4,13 +4,17 @@
-

Список выставок на главной

+

Список {% if conf %}конференций{% else %}выставок{% endif %} на главной

{% block list_table %} + {% endif %} +
Только опубликование @@ -19,7 +23,11 @@ - + {% if conf %} + + {% else %} + + {% endif %} @@ -31,8 +39,13 @@ - - + {% if conf %} + + + {% else %} + + + {% endif %} {% endfor %} diff --git a/templates/admin/expobanner/paid_create.html b/templates/admin/expobanner/paid_create.html index 4e3af395..ede4d3da 100644 --- a/templates/admin/expobanner/paid_create.html +++ b/templates/admin/expobanner/paid_create.html @@ -39,6 +39,39 @@ } }); + + $('#id_conf').select2({ + placeholder: 'Найти', + width: 'element', + ajax: { + url: '/admin/conference/search/', + dataType: "json", + quietMillis: 200, + multiple: true, + + data: function(term, page){ + return {term: term, + page: page}; + }, + + results: function (data) { + var results = []; + $.each(data, function(index, item){ + results.push({ + id: item.id, + text: item.label + }); + }); + return {results: results}; + } + }, + initSelection : function(element, callback) { + var id= $(element).val(); + var text = $(element).attr('data-init-text'); + callback({id: id, text:text}); + + } + }); }); {% endblock %} diff --git a/templates/admin/includes/admin_nav.html b/templates/admin/includes/admin_nav.html index f70cb26a..6286d233 100644 --- a/templates/admin/includes/admin_nav.html +++ b/templates/admin/includes/admin_nav.html @@ -107,6 +107,7 @@
  • Платные выставки
  • Выставки в топе
  • Выставки на главной
    • +
  • Конференции на главной
    • From 032d989323a1186b457c0c9bbf6524e863f9323d Mon Sep 17 00:00:00 2001 From: Nazar Kotjuk Date: Wed, 14 Oct 2015 00:41:46 +0300 Subject: [PATCH 8/8] dev fixes --- conference/models.py | 10 +++++++ exposition/models.py | 11 +++----- functions/model_mixin.py | 17 +++++------- functions/models_methods.py | 16 ++++++++++++ proj/views.py | 26 +++++++++---------- templates/admin/article/blog_form.html | 2 +- .../conference/conference_services.html | 15 +++++------ .../client/includes/index/main_events.html | 2 +- 8 files changed, 57 insertions(+), 42 deletions(-) diff --git a/conference/models.py b/conference/models.py index f1173103..8f067230 100644 --- a/conference/models.py +++ b/conference/models.py @@ -133,6 +133,13 @@ class Conference(TranslatableModel, EventMixin, ExpoMixin): return list(qs) #return list(Service.objects.language().filter(url__in=ids, type=Service.type.conference).order_by('sort')) + def get_services_detail(self): + excluded = ['tickets'] + country_ids = [item for item, bool in self.country.services if bool==True] + ids = [item for item, bool in self.services if bool==True] + qs = Service.objects.language().exclude(url__in=excluded).filter(Q(Q(url__in=country_ids) & Q(type=Service.type.conference)) | Q(url__in=ids)) + return list(qs) + def get_nearest_events(self): if self.theme.all(): theme = self.theme.all()[0] @@ -164,6 +171,9 @@ class Conference(TranslatableModel, EventMixin, ExpoMixin): def get_visit_url(self): return '/conference-visit/%s/'%self.id + def get_note_url(self): + return '/conference/add-note/%s/'%self.url + def get_note_by_user(self, user_id): note = self.note.filter(user__id=user_id) try: diff --git a/exposition/models.py b/exposition/models.py index f8a652bb..0ba5874a 100644 --- a/exposition/models.py +++ b/exposition/models.py @@ -183,7 +183,7 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): country_ids = [item for item, bool in self.country.services if bool==True] ids = [item for item, bool in self.services if bool==True] qs = Service.objects.language().exclude(url__in=excluded).filter(Q(Q(url__in=country_ids) & Q(type=Service.type.expo)) | Q(url__in=ids)) - return qs + return list(qs) def get_parent(self): return {} @@ -292,6 +292,9 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): def get_visit_url(self): return '/exposition-visit/%s/'%self.id + def get_note_url(self): + return '/expo/add-note/%s/'%self.url + def get_timetables_days(self): tables = self.business_program.all() days = [] @@ -313,12 +316,6 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): def theme_ids(self): return [item['id'] for item in self.theme.all().values('id')] - def get_main_link(self): - if self.main: - return self.main.link.get_click_link() - else: - return self.get_permanent_url() - def get_top_link(self): if self.top: return self.top.link.get_click_link() diff --git a/functions/model_mixin.py b/functions/model_mixin.py index 5577ac9c..30b0a6de 100644 --- a/functions/model_mixin.py +++ b/functions/model_mixin.py @@ -5,11 +5,6 @@ from service.models import Service class ExpoMixin(object): - -# def get_index_text(self): -# names = [tr.name for tr in self.translations.all()] -# return names - def get_logo(self): logo = self.files.filter(purpose='logo') @@ -34,6 +29,12 @@ class EventMixin(object): url = '%s%s/'%(self.get_catalog_url(), self.url) return url + def get_main_link(self): + if self.main: + return self.main.link.get_click_link() + else: + return self.get_permanent_url() + def get_paid_catalog_url(self): return self.paid_new.catalog.get_click_link() @@ -45,12 +46,6 @@ class EventMixin(object): def get_logo(self): return self.logo - """ - logo = self.files.filter(purpose='logo') - if logo: - return logo[0] - return logo - """ def get_preview(self): diff --git a/functions/models_methods.py b/functions/models_methods.py index c5c45e58..943fac5b 100644 --- a/functions/models_methods.py +++ b/functions/models_methods.py @@ -39,6 +39,22 @@ class ExpoManager(TranslationManager): return result + def conf_main(self): + lang = translation.get_language() + key = 'conf_main_page_key_%s'%lang + result = cache.get(key) + if not result: + result = list(self.language(lang). + select_related('country', 'city', 'place', 'main'). + prefetch_related('tag'). + filter(main__isnull=False). + filter(main__public=True)) + cache.set(key, result, 50) + + return result + + + class CityManager(TranslationManager): diff --git a/proj/views.py b/proj/views.py index cfb06577..4746b611 100644 --- a/proj/views.py +++ b/proj/views.py @@ -1,22 +1,18 @@ # -*- coding: utf-8 -*- -from django.core.context_processors import csrf from django.shortcuts import render_to_response from django.template import RequestContext from django.views.generic import TemplateView from django.conf import settings -from exposition.models import Exposition -from theme.models import Theme -from news.models import News -from article.models import Article -from functions.cache_mixin import JitterCacheMixin, CacheMixin - -from functions.forms import ThemeSearch, PlaceSearch - -from functions.search_forms import EventSearchForm, ExpositionSearchForm -from functions.custom_views import ExpoListView +from django.utils.translation import get_language +from functions.cache_mixin import JitterCacheMixin +from functions.forms import ThemeSearch +from functions.search_forms import ExpositionSearchForm from accounts.forms import RegistrationCompleteForm, SocialRegistrationCompleteForm from meta.models import SeoText -from django.utils.translation import get_language +from theme.models import Theme +from article.models import Article +from exposition.models import Exposition +from conference.models import Conference def clear_slashes(str_): @@ -73,11 +69,13 @@ def error404(request): class MainPageView(JitterCacheMixin, TemplateView): cache_range = settings.CACHE_RANGE - template_name = 'index.html' + template_name = 'client/index.html' def get_context_data(self, **kwargs): context = super(MainPageView, self).get_context_data(**kwargs) - ev = Exposition.objects.expo_main() + ex = Exposition.objects.expo_main() + conf = Conference.objects.conf_main() + ev = ex + conf events = sorted(ev, key=lambda x: x.main.position) # update main_page counter for event in events: diff --git a/templates/admin/article/blog_form.html b/templates/admin/article/blog_form.html index 057b565d..5bf5a5de 100644 --- a/templates/admin/article/blog_form.html +++ b/templates/admin/article/blog_form.html @@ -53,7 +53,7 @@ {% if not article %}
    - +
    {{ form.slug }} {{ form.slug.errors }} diff --git a/templates/client/includes/conference/conference_services.html b/templates/client/includes/conference/conference_services.html index 829bfd97..b98f4d71 100644 --- a/templates/client/includes/conference/conference_services.html +++ b/templates/client/includes/conference/conference_services.html @@ -2,13 +2,12 @@
    \ No newline at end of file diff --git a/templates/client/includes/index/main_events.html b/templates/client/includes/index/main_events.html index 17368ba8..6fa3c0ca 100644 --- a/templates/client/includes/index/main_events.html +++ b/templates/client/includes/index/main_events.html @@ -36,7 +36,7 @@
    {% if event|in_calendar:request.user %}{% trans 'Убрать из календаря' %}{% else %}{% trans 'добавить в календарь' %}{% endif %}
    - {% trans 'заметка' %} + {% trans 'заметка' %}
    ВыставкаКонференцияВыставкаПозиция    
    {{ item }} {{ item.main.position }}Изменить {% if item.main.public %}отключить{% else %}включить{% endif %} Изменить {% if item.main.public %}отключить{% else %}включить{% endif %} Изменить {% if item.main.public %}отключить{% else %}включить{% endif %} Статистика