mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add meta

Browse Source
remotes/origin/1203
Nazar Kotjuk 10 years ago
parent e79a292abb
commit 8ea1851bc5
11 changed files with 32 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      article/urls.py
  2. 6
      article/views.py
  3. 16
      city/models.py
  4. 4
      conference/urls.py
  5. 4
      conference/views.py
  6. 4
      exposition/urls.py
  7. 4
      exposition/views.py
  8. 1
      meta/views.py
  9. 21
      place_exposition/urls.py
  10. 4
      place_exposition/views.py
  11. 2
      proj/settings.py

4
article/urls.py
Unescape View File

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

6
article/views.py
Unescape View File

@ -181,8 +181,8 @@ class BlogsFilterCatalog(MetadataMixin, ListView):
def get_queryset(self, **kwargs): def get_queryset(self, **kwargs):
slug = self.kwargs.get('slug') slug = self.kwargs.get('slug')
filter = self.kwargs['filter'] filter_slug = self.kwargs['filter']
if filter == 'tag': if filter_slug == 'tag':
tag = get_object_or_404(Tag, url=slug) tag = get_object_or_404(Tag, url=slug)
self.kwargs['tag'] = tag self.kwargs['tag'] = tag
self.filter_object = tag self.filter_object = tag
@ -197,7 +197,7 @@ class BlogsFilterCatalog(MetadataMixin, ListView):
if year: if year:
qs = qs.filter(publish_date__year=year) qs = qs.filter(publish_date__year=year)
# info for breadscrumbs # 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') month = self.kwargs.get('month')

16
city/models.py
Unescape View File

@ -8,15 +8,10 @@ from hvad.models import TranslatableModel, TranslatedFields, TranslationManager
from bitfield import BitField from bitfield import BitField
from sorl.thumbnail import ImageField from sorl.thumbnail import ImageField
from directories.models import Iata 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.db import db_table_exists
from functions.signal_handlers import post_save_handler, pre_save_handler from functions.signal_handlers import post_save_handler, pre_save_handler
from functions.models_methods import ExpoManager, CityManager 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 #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 [] #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 returns nearest expos in this city
""" """
from exposition.models import Exposition
now = date.today() now = date.today()
return Exposition.objects.filter(data_begin__gte=now, city=self).order_by('data_begin')[:3] return Exposition.objects.filter(data_begin__gte=now, city=self).order_by('data_begin')[:3]
def get_places(self): def get_places(self):
from place_exposition.models import PlaceExposition
return PlaceExposition.objects.filter(city=self)[:3] return PlaceExposition.objects.filter(city=self)[:3]
def get_permanent_url(self): def get_permanent_url(self):
return self.catalog+self.url return self.catalog+self.url
def expositions_number(self): def expositions_number(self):
from exposition.models import Exposition
return Exposition.objects.filter(city=self).count() return Exposition.objects.filter(city=self).count()
def conferences_number(self): def conferences_number(self):
from conference.models import Conference
return Conference.objects.filter(city=self).count() 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): def get_parent(self):
""" """

4
conference/urls.py
Unescape View File

@ -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>.*)/(?P<year>\d+)/$', ConferenceTagCatalog.as_view(), {'meta_id':33}),
url(r'conference/tag/(?P<slug>.*)/$', ConferenceTagCatalog.as_view(), {'meta_id':32}), url(r'conference/tag/(?P<slug>.*)/$', ConferenceTagCatalog.as_view(), {'meta_id':32}),
# conf additional pages # conf additional pages
url(r'^conference/(?P<slug>.*)/photo/page/(?P<page>\d+)/$', 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()), 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/page/(?P<page>\d+)/$', ConferenceVisitors.as_view()),
url(r'conference/(?P<slug>.*)/visitors/$', 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()), url(r'conference/(?P<slug>.*)/members/page/(?P<page>\d+)/$', ConferenceMembers.as_view()),

4
conference/views.py
Unescape View File

@ -445,7 +445,7 @@ class ConferencePhotoView(MetadataMixin, ListView):
def get_queryset(self): def get_queryset(self):
slug = self.kwargs.get('slug') slug = self.kwargs.get('slug')
conf = get_object_or_404(Conference, url=slug) conf = get_object_or_404(Conference, url=slug)
self.obj = conf self.object = conf
if conf.photogallery: if conf.photogallery:
return conf.photogallery.photos.all() return conf.photogallery.photos.all()
else: else:
@ -453,7 +453,7 @@ class ConferencePhotoView(MetadataMixin, ListView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(ConferencePhotoView, self).get_context_data(**kwargs) context = super(ConferencePhotoView, self).get_context_data(**kwargs)
obj = self.obj obj = self.object
context['object'] = obj context['object'] = obj
context['city'] = str(obj.city_id) context['city'] = str(obj.city_id)
context['country'] = str(obj.country_id) context['country'] = str(obj.country_id)

4
exposition/urls.py
Unescape View File

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

4
exposition/views.py
Unescape View File

@ -556,7 +556,7 @@ class ExpoPhotoView(MetadataMixin, ListView):
def get_queryset(self): def get_queryset(self):
slug = self.kwargs.get('slug') slug = self.kwargs.get('slug')
expo = get_object_or_404(Exposition, url=slug) expo = get_object_or_404(Exposition, url=slug)
self.obj = expo self.object = expo
if expo.photogallery: if expo.photogallery:
return expo.photogallery.photos.all() return expo.photogallery.photos.all()
else: else:
@ -564,7 +564,7 @@ class ExpoPhotoView(MetadataMixin, ListView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(ExpoPhotoView, self).get_context_data(**kwargs) context = super(ExpoPhotoView, self).get_context_data(**kwargs)
obj = self.obj obj = self.object
context['object'] = obj context['object'] = obj
context['city'] = str(obj.city_id) context['city'] = str(obj.city_id)
context['country'] = str(obj.country_id) context['country'] = str(obj.country_id)

1
meta/views.py
Unescape View File

@ -164,6 +164,7 @@ class MetadataMixin(object):
except MetaSetting.DoesNotExist: except MetaSetting.DoesNotExist:
return context return context
params = dict(self.kwargs) params = dict(self.kwargs)
if getattr(self, 'object', None): if getattr(self, 'object', None):
data = meta_set.generate_meta(params, self.object) data = meta_set.generate_meta(params, self.object)
else: else:

21
place_exposition/urls.py
Unescape View File

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

4
place_exposition/views.py
Unescape View File

@ -95,7 +95,7 @@ class PlaceDetail(JitterCacheMixin, MetadataMixin, DetailView):
return context return context
class PlacePhoto(ListView): class PlacePhoto(MetadataMixin, ListView):
template_name = 'client/place/photo.html' template_name = 'client/place/photo.html'
obj = None obj = None
paginate_by = settings.CLIENT_PAGINATION paginate_by = settings.CLIENT_PAGINATION
@ -111,6 +111,8 @@ class PlacePhoto(ListView):
raise Http404(_("No %(verbose_name)s found matching the query") % raise Http404(_("No %(verbose_name)s found matching the query") %
{'verbose_name': PlaceExposition._meta.verbose_name}) {'verbose_name': PlaceExposition._meta.verbose_name})
self.obj = place self.obj = place
self.object = place
# self.kwargs['object'] = place
if place.photogallery: if place.photogallery:
return place.photogallery.photos.all() return place.photogallery.photos.all()
else: else:

2
proj/settings.py
Unescape View File

@ -426,6 +426,8 @@ LOGGING = {
# update banner logs # update banner logs
10 * * * * /usr/bin/python /var/www/proj/manage.py banner_log_update 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 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 THUMBNAIL_DEBUG = DEBUG

Write Preview
Loading…
Cancel
Save