diff --git a/article/urls.py b/article/urls.py index 9488f8e5..afb5802c 100644 --- a/article/urls.py +++ b/article/urls.py @@ -6,13 +6,13 @@ urlpatterns = patterns('', url(r'^blogs/tag/(?P.*)/page/(?P\d+)/$', BlogsFilterCatalog.as_view(), {'meta_id': 75, 'filter': 'tag'}), url(r'^blogs/theme/(?P.*)/page/(?P\d+)/$', BlogsFilterCatalog.as_view(), - {'filter': 'theme'}), + {'meta_id': 90, 'filter': 'theme'}), url(r'^blogs/page/(?P\d+)/$', BlogList.as_view(), {'meta_id': 79}), url(r'^blogs/tag/(?P.*)/$', BlogsFilterCatalog.as_view(), {'meta_id': 75, 'filter': 'tag'}), url(r'^blogs/theme/(?P.*)/$', BlogsFilterCatalog.as_view(), - {'filter': 'theme'}), + {'meta_id': 90, 'filter': 'theme'}), url(r'^blogs/$', BlogList.as_view(), {'meta_id': 79}), diff --git a/article/views.py b/article/views.py index 5cc1fe6d..8ff8da5f 100644 --- a/article/views.py +++ b/article/views.py @@ -181,8 +181,8 @@ class BlogsFilterCatalog(MetadataMixin, ListView): def get_queryset(self, **kwargs): slug = self.kwargs.get('slug') - filter = self.kwargs['filter'] - if filter == 'tag': + filter_slug = self.kwargs['filter'] + if filter_slug == 'tag': tag = get_object_or_404(Tag, url=slug) self.kwargs['tag'] = tag self.filter_object = tag @@ -197,7 +197,7 @@ class BlogsFilterCatalog(MetadataMixin, ListView): if year: qs = qs.filter(publish_date__year=year) # info for breadscrumbs - self.year = {'text': year, 'link': '%s%s/%s/'%(self.catalog_url, self.filter_object.url, year)} + self.year = {'text': year, 'link': '%s%s/%s/' % (self.catalog_url, self.filter_object.url, year)} month = self.kwargs.get('month') diff --git a/city/models.py b/city/models.py index cb0bdeca..db53599e 100644 --- a/city/models.py +++ b/city/models.py @@ -8,15 +8,10 @@ from hvad.models import TranslatableModel, TranslatedFields, TranslationManager from bitfield import BitField from sorl.thumbnail import ImageField from directories.models import Iata -from exposition.models import Exposition -from place_exposition.models import PlaceExposition -from conference.models import Conference -from seminar.models import Seminar -from webinar.models import Webinar from functions.db import db_table_exists from functions.signal_handlers import post_save_handler, pre_save_handler from functions.models_methods import ExpoManager, CityManager -from service.models import Service +#from service.models import Service #check if table exist and create flags if true #flags = [str(item.url) for item in Service.objects.all()] if db_table_exists('service_service') else [] @@ -76,26 +71,25 @@ class City(TranslatableModel): """ returns nearest expos in this city """ + from exposition.models import Exposition now = date.today() return Exposition.objects.filter(data_begin__gte=now, city=self).order_by('data_begin')[:3] def get_places(self): + from place_exposition.models import PlaceExposition return PlaceExposition.objects.filter(city=self)[:3] def get_permanent_url(self): return self.catalog+self.url def expositions_number(self): + from exposition.models import Exposition return Exposition.objects.filter(city=self).count() def conferences_number(self): + from conference.models import Conference return Conference.objects.filter(city=self).count() - def seminars_number(self): - return Seminar.objects.filter(city=self).count() - - def webinars_number(self): - return Webinar.objects.filter(city=self).count() def get_parent(self): """ diff --git a/conference/urls.py b/conference/urls.py index 9e24ad9a..79701950 100644 --- a/conference/urls.py +++ b/conference/urls.py @@ -61,8 +61,8 @@ urlpatterns = patterns('', url(r'conference/tag/(?P.*)/(?P\d+)/$', ConferenceTagCatalog.as_view(), {'meta_id':33}), url(r'conference/tag/(?P.*)/$', ConferenceTagCatalog.as_view(), {'meta_id':32}), # conf additional pages - url(r'^conference/(?P.*)/photo/page/(?P\d+)/$', ConferencePhotoView.as_view()), - url(r'^conference/(?P.*)/photo/$', ConferencePhotoView.as_view()), + url(r'^conference/(?P.*)/photo/page/(?P\d+)/$', ConferencePhotoView.as_view(), {'meta_id': 93}), + url(r'^conference/(?P.*)/photo/$', ConferencePhotoView.as_view(), {'meta_id': 93}), url(r'conference/(?P.*)/visitors/page/(?P\d+)/$', ConferenceVisitors.as_view()), url(r'conference/(?P.*)/visitors/$', ConferenceVisitors.as_view()), url(r'conference/(?P.*)/members/page/(?P\d+)/$', ConferenceMembers.as_view()), diff --git a/conference/views.py b/conference/views.py index abcbd2ce..83ffa8a0 100644 --- a/conference/views.py +++ b/conference/views.py @@ -445,7 +445,7 @@ class ConferencePhotoView(MetadataMixin, ListView): def get_queryset(self): slug = self.kwargs.get('slug') conf = get_object_or_404(Conference, url=slug) - self.obj = conf + self.object = conf if conf.photogallery: return conf.photogallery.photos.all() else: @@ -453,7 +453,7 @@ class ConferencePhotoView(MetadataMixin, ListView): def get_context_data(self, **kwargs): context = super(ConferencePhotoView, self).get_context_data(**kwargs) - obj = self.obj + obj = self.object context['object'] = obj context['city'] = str(obj.city_id) context['country'] = str(obj.country_id) diff --git a/exposition/urls.py b/exposition/urls.py index e61f77d4..9b8d39db 100644 --- a/exposition/urls.py +++ b/exposition/urls.py @@ -67,8 +67,8 @@ urlpatterns = patterns('', url(r'^expo/(?P.*)/program/$', ExpositionProgramme.as_view(), {'meta_id':62}), url(r'^expo/(?P.*)/visitors/page/(?P\d+)/$', ExpoVisitors.as_view(), {'meta_id':64}), url(r'^expo/(?P.*)/visitors/$', ExpoVisitors.as_view(), {'meta_id':64}), - url(r'^expo/(?P.*)/photo/page/(?P\d+)/$', ExpoPhotoView.as_view()), - url(r'^expo/(?P.*)/photo/$', ExpoPhotoView.as_view()), + url(r'^expo/(?P.*)/photo/page/(?P\d+)/$', ExpoPhotoView.as_view(), {'meta_id': 92}), + url(r'^expo/(?P.*)/photo/$', ExpoPhotoView.as_view(), {'meta_id': 92}), url(r'^expo/(?P.*)/members/page/(?P\d+)/$', ExpoMembers.as_view(), {'meta_id':63}), url(r'^expo/(?P.*)/members/$', ExpoMembers.as_view(), {'meta_id':63}), url(r'^expo/(?P.*)/service/thanks/', ExpositionThankView.as_view()), diff --git a/exposition/views.py b/exposition/views.py index 965d6147..3643a636 100644 --- a/exposition/views.py +++ b/exposition/views.py @@ -556,7 +556,7 @@ class ExpoPhotoView(MetadataMixin, ListView): def get_queryset(self): slug = self.kwargs.get('slug') expo = get_object_or_404(Exposition, url=slug) - self.obj = expo + self.object = expo if expo.photogallery: return expo.photogallery.photos.all() else: @@ -564,7 +564,7 @@ class ExpoPhotoView(MetadataMixin, ListView): def get_context_data(self, **kwargs): context = super(ExpoPhotoView, self).get_context_data(**kwargs) - obj = self.obj + obj = self.object context['object'] = obj context['city'] = str(obj.city_id) context['country'] = str(obj.country_id) diff --git a/meta/views.py b/meta/views.py index 81db7390..6b821822 100644 --- a/meta/views.py +++ b/meta/views.py @@ -164,6 +164,7 @@ class MetadataMixin(object): except MetaSetting.DoesNotExist: return context params = dict(self.kwargs) + if getattr(self, 'object', None): data = meta_set.generate_meta(params, self.object) else: diff --git a/place_exposition/urls.py b/place_exposition/urls.py index 6c40ed2b..b850e636 100644 --- a/place_exposition/urls.py +++ b/place_exposition/urls.py @@ -5,19 +5,14 @@ from views import PlaceDetail, PlaceList, PlaceCityCatalog, PlaceCountryCatalog, urlpatterns = patterns('', + url(r'country/(?P.*)/page/(?P\d+)/$', PlaceCountryCatalog.as_view(), {'meta_id': 49}), + url(r'country/(?P.*)/$', PlaceCountryCatalog.as_view(), {'meta_id': 49}), - #url(r'country/$', PlaceCountryCatalog.as_view()), - url(r'country/(?P.*)/page/(?P\d+)/$', PlaceCountryCatalog.as_view(), {'meta_id':49}), - url(r'country/(?P.*)/$', PlaceCountryCatalog.as_view(), {'meta_id':49}), - # correct - #url(r'expo/city/$', ExpositionByCity.as_view()), - url(r'city/(?P.*)/page/(?P\d+)/$', PlaceCityCatalog.as_view(), {'meta_id':48}), - url(r'city/(?P.*)/$', PlaceCityCatalog.as_view(), {'meta_id':48}), - #!!! - url(r'(?P.*)/photo/page/(?P\d+)/$', PlacePhoto.as_view()), - url(r'(?P.*)/photo/$', PlacePhoto.as_view()), - #url(r'expo/(?P.*)/service/(?P.*)/$', ExpositionServiceView.as_view()), - url(r'page/(?P\d+)/$', PlaceList.as_view(), {'meta_id':46}), - url(r'(?P.*)/$', PlaceDetail.as_view(), {'meta_id':47}), + url(r'city/(?P.*)/page/(?P\d+)/$', PlaceCityCatalog.as_view(), {'meta_id': 48}), + url(r'city/(?P.*)/$', PlaceCityCatalog.as_view(), {'meta_id': 48}), + url(r'(?P.*)/photo/page/(?P\d+)/$', PlacePhoto.as_view(), {'meta_id': 91}), + url(r'(?P.*)/photo/$', PlacePhoto.as_view(), {'meta_id': 91}), + url(r'page/(?P\d+)/$', PlaceList.as_view(), {'meta_id': 46}), + url(r'(?P.*)/$', PlaceDetail.as_view(), {'meta_id': 47}), url(r'$', PlaceList.as_view(), {'meta_id':46}), ) diff --git a/place_exposition/views.py b/place_exposition/views.py index 66732911..a8a94806 100644 --- a/place_exposition/views.py +++ b/place_exposition/views.py @@ -95,7 +95,7 @@ class PlaceDetail(JitterCacheMixin, MetadataMixin, DetailView): return context -class PlacePhoto(ListView): +class PlacePhoto(MetadataMixin, ListView): template_name = 'client/place/photo.html' obj = None paginate_by = settings.CLIENT_PAGINATION @@ -111,6 +111,8 @@ class PlacePhoto(ListView): raise Http404(_("No %(verbose_name)s found matching the query") % {'verbose_name': PlaceExposition._meta.verbose_name}) self.obj = place + self.object = place +# self.kwargs['object'] = place if place.photogallery: return place.photogallery.photos.all() else: diff --git a/proj/settings.py b/proj/settings.py index 161dcb90..2b385ac6 100644 --- a/proj/settings.py +++ b/proj/settings.py @@ -426,6 +426,8 @@ LOGGING = { # update banner logs 10 * * * * /usr/bin/python /var/www/proj/manage.py banner_log_update 20 2,14 * * * /usr/bin/python /var/www/proj/manage.py banner_log_check_previous_day +# update hotels prices +20 1 * * 6 /usr/bin/python /var/www/proj/manage.py update_hotels_price """ THUMBNAIL_DEBUG = DEBUG