add meta

article/urls.py

@@ -6,13 +6,13 @@ urlpatterns = patterns('',
     url(r'^blogs/tag/(?P<slug>.*)/page/(?P<page>\d+)/$', BlogsFilterCatalog.as_view(),
         {'meta_id': 75, 'filter': 'tag'}),
     url(r'^blogs/theme/(?P<slug>.*)/page/(?P<page>\d+)/$', BlogsFilterCatalog.as_view(),
-        {'filter': 'theme'}),
+        {'meta_id': 90, 'filter': 'theme'}),
     url(r'^blogs/page/(?P<page>\d+)/$', BlogList.as_view(),
         {'meta_id': 79}),
     url(r'^blogs/tag/(?P<slug>.*)/$', BlogsFilterCatalog.as_view(),
         {'meta_id': 75, 'filter': 'tag'}),
     url(r'^blogs/theme/(?P<slug>.*)/$', BlogsFilterCatalog.as_view(),
-        {'filter': 'theme'}),
+        {'meta_id': 90, 'filter': 'theme'}),
     url(r'^blogs/$', BlogList.as_view(),
         {'meta_id': 79}),
 

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')
 

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):
         """

conference/urls.py

@@ -61,8 +61,8 @@ urlpatterns = patterns('',
     url(r'conference/tag/(?P<slug>.*)/(?P<year>\d+)/$', ConferenceTagCatalog.as_view(), {'meta_id':33}),
     url(r'conference/tag/(?P<slug>.*)/$', ConferenceTagCatalog.as_view(), {'meta_id':32}),
     # conf additional pages
-    url(r'^conference/(?P<slug>.*)/photo/page/(?P<page>\d+)/$', ConferencePhotoView.as_view()),
-    url(r'^conference/(?P<slug>.*)/photo/$', ConferencePhotoView.as_view()),
+    url(r'^conference/(?P<slug>.*)/photo/page/(?P<page>\d+)/$', ConferencePhotoView.as_view(), {'meta_id': 93}),
+    url(r'^conference/(?P<slug>.*)/photo/$', ConferencePhotoView.as_view(), {'meta_id': 93}),
     url(r'conference/(?P<slug>.*)/visitors/page/(?P<page>\d+)/$', ConferenceVisitors.as_view()),
     url(r'conference/(?P<slug>.*)/visitors/$', ConferenceVisitors.as_view()),
     url(r'conference/(?P<slug>.*)/members/page/(?P<page>\d+)/$', ConferenceMembers.as_view()),

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)

exposition/urls.py

@@ -67,8 +67,8 @@ urlpatterns = patterns('',
     url(r'^expo/(?P<slug>.*)/program/$', ExpositionProgramme.as_view(), {'meta_id':62}),
     url(r'^expo/(?P<slug>.*)/visitors/page/(?P<page>\d+)/$', ExpoVisitors.as_view(), {'meta_id':64}),
     url(r'^expo/(?P<slug>.*)/visitors/$', ExpoVisitors.as_view(), {'meta_id':64}),
-    url(r'^expo/(?P<slug>.*)/photo/page/(?P<page>\d+)/$', ExpoPhotoView.as_view()),
-    url(r'^expo/(?P<slug>.*)/photo/$', ExpoPhotoView.as_view()),
+    url(r'^expo/(?P<slug>.*)/photo/page/(?P<page>\d+)/$', ExpoPhotoView.as_view(), {'meta_id': 92}),
+    url(r'^expo/(?P<slug>.*)/photo/$', ExpoPhotoView.as_view(), {'meta_id': 92}),
     url(r'^expo/(?P<slug>.*)/members/page/(?P<page>\d+)/$', ExpoMembers.as_view(), {'meta_id':63}),
     url(r'^expo/(?P<slug>.*)/members/$', ExpoMembers.as_view(), {'meta_id':63}),
     url(r'^expo/(?P<slug>.*)/service/thanks/', ExpositionThankView.as_view()),

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)

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:

place_exposition/urls.py

@@ -5,19 +5,14 @@ from views import PlaceDetail, PlaceList, PlaceCityCatalog, PlaceCountryCatalog,
 
 
 urlpatterns = patterns('',
+    url(r'country/(?P<slug>.*)/page/(?P<page>\d+)/$', PlaceCountryCatalog.as_view(), {'meta_id': 49}),
+    url(r'country/(?P<slug>.*)/$', PlaceCountryCatalog.as_view(), {'meta_id': 49}),
 
-    #url(r'country/$', PlaceCountryCatalog.as_view()),
-    url(r'country/(?P<slug>.*)/page/(?P<page>\d+)/$', PlaceCountryCatalog.as_view(), {'meta_id':49}),
-    url(r'country/(?P<slug>.*)/$', PlaceCountryCatalog.as_view(), {'meta_id':49}),
-    # correct
-    #url(r'expo/city/$', ExpositionByCity.as_view()),
-    url(r'city/(?P<slug>.*)/page/(?P<page>\d+)/$', PlaceCityCatalog.as_view(), {'meta_id':48}),
-    url(r'city/(?P<slug>.*)/$', PlaceCityCatalog.as_view(), {'meta_id':48}),
-    #!!!
-    url(r'(?P<slug>.*)/photo/page/(?P<page>\d+)/$', PlacePhoto.as_view()),
-    url(r'(?P<slug>.*)/photo/$', PlacePhoto.as_view()),
-    #url(r'expo/(?P<slug>.*)/service/(?P<url>.*)/$', ExpositionServiceView.as_view()),
-    url(r'page/(?P<page>\d+)/$', PlaceList.as_view(), {'meta_id':46}),
-    url(r'(?P<slug>.*)/$', PlaceDetail.as_view(), {'meta_id':47}),
+    url(r'city/(?P<slug>.*)/page/(?P<page>\d+)/$', PlaceCityCatalog.as_view(), {'meta_id': 48}),
+    url(r'city/(?P<slug>.*)/$', PlaceCityCatalog.as_view(), {'meta_id': 48}),
+    url(r'(?P<slug>.*)/photo/page/(?P<page>\d+)/$', PlacePhoto.as_view(), {'meta_id': 91}),
+    url(r'(?P<slug>.*)/photo/$', PlacePhoto.as_view(), {'meta_id': 91}),
+    url(r'page/(?P<page>\d+)/$', PlaceList.as_view(), {'meta_id': 46}),
+    url(r'(?P<slug>.*)/$', PlaceDetail.as_view(), {'meta_id': 47}),
     url(r'$', PlaceList.as_view(), {'meta_id':46}),
     )

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:

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