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

Merge branch 'develop' of gitlab.com:OldminTeam/expomap into develop

Browse Source
remotes/origin/HEAD
Slava Kyrachevsky 9 years ago
parent 431362c918 1f1705699d
commit b0474efc90
5 changed files with 1400 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      apps/conference/tests/__init__.py
  2. 1315
      apps/conference/tests/test_views.py
  3. 114
      apps/conference/urls.py
  4. 6
      apps/conference/views.py
  5. 10
      proj/settings.py

2
apps/conference/tests/__init__.py
Unescape View File

@ -1,2 +1,2 @@
# from .test_models import *
from .test_models import *
from .test_views import *

1315
apps/conference/tests/test_views.py
View File

File diff suppressed because it is too large Load Diff

114
apps/conference/urls.py
Unescape View File

@ -41,46 +41,98 @@ urlpatterns = patterns('',
name='conference_country'),
url(r'^conference/country/(?P<slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/page/(?P<page>\d+)/$',
ConferenceCountryCatalog.as_view(), {'meta_id':25},
name='conference_country_catalog'),
url(r'^conference/country/(?P<slug>[^/]*)/(?P<year>\d+)/page/(?P<page>\d+)/$', ConferenceCountryCatalog.as_view(), {'meta_id':24}),
url(r'^conference/country/(?P<slug>[^/]*)/page/(?P<page>\d+)/$', ConferenceCountryCatalog.as_view(), {'meta_id':23}),
url(r'^conference/country/(?P<slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/$', ConferenceCountryCatalog.as_view(), {'meta_id':25}),
url(r'^conference/country/(?P<slug>[^/]*)/(?P<year>\d+)/$', ConferenceCountryCatalog.as_view(), {'meta_id':24}),
name='conference_country_catalog_slug_year_month_page'),
url(r'^conference/country/(?P<slug>[^/]*)/(?P<year>\d+)/page/(?P<page>\d+)/$',
ConferenceCountryCatalog.as_view(), {'meta_id':24},
name='conference_country_catalog_slug_year_page'
),
url(r'^conference/country/(?P<slug>[^/]*)/page/(?P<page>\d+)/$',
ConferenceCountryCatalog.as_view(), {'meta_id':23},
name='conference_country_catalog_slug_page'),
url(r'^conference/country/(?P<slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/$',
ConferenceCountryCatalog.as_view(), {'meta_id':25},
name='conference_country_catalog_slug_year_month'),
url(r'^conference/country/(?P<slug>[^/]*)/(?P<year>\d+)/$',
ConferenceCountryCatalog.as_view(), {'meta_id':24},
name='conference_country_catalog_slug_year'),
url(r'^conference/country/(?P<slug>[^/]*)/$', ConferenceCountryCatalog.as_view(), {'meta_id':23}, name='conf_country'),
# city catalog
url(r'^conference/city/$',
ConferenceByCity.as_view(), {'meta_id':52}, name='conference_city'),
url(r'^conference/city/(?P<slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/page/(?P<page>\d+)/$', ConferenceCityCatalog.as_view(), {'meta_id':28}),
url(r'^conference/city/(?P<slug>[^/]*)/(?P<year>\d+)/page/(?P<page>\d+)/$', ConferenceCityCatalog.as_view(), {'meta_id':27}),
url(r'^conference/city/(?P<slug>[^/]*)/page/(?P<page>\d+)/$', ConferenceCityCatalog.as_view(), {'meta_id':26}),
url(r'^conference/city/(?P<slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/$', ConferenceCityCatalog.as_view(), {'meta_id':28}),
url(r'^conference/city/(?P<slug>[^/]*)/(?P<year>\d+)/$', ConferenceCityCatalog.as_view(), {'meta_id':27}),
url(r'^conference/city/(?P<slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/page/(?P<page>\d+)/$',
ConferenceCityCatalog.as_view(), {'meta_id':28},
name='conference_city_catalog_slug_year_month_page'),
url(r'^conference/city/(?P<slug>[^/]*)/(?P<year>\d+)/page/(?P<page>\d+)/$',
ConferenceCityCatalog.as_view(), {'meta_id':27},
name='conference_city_catalog_slug_year_page'),
url(r'^conference/city/(?P<slug>[^/]*)/page/(?P<page>\d+)/$',
ConferenceCityCatalog.as_view(), {'meta_id':26},
name='conference_city_catalog_slug_page'),
url(r'^conference/city/(?P<slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/$',
ConferenceCityCatalog.as_view(), {'meta_id':28},
name='conference_city_catalog_slug_year_month'),
url(r'^conference/city/(?P<slug>[^/]*)/(?P<year>\d+)/$',
ConferenceCityCatalog.as_view(), {'meta_id':27},
name='conference_city_catalog_slug_year'),
url(r'^conference/city/(?P<slug>[^/]*)/$', ConferenceCityCatalog.as_view(), {'meta_id':26}, name='conf_city'),
# theme catalog
url(r'^conference/theme/$',
ConferenceByTheme.as_view(), {'meta_id':50}, name='conference_theme'),
url(r'^conference/theme/(?P<slug>[^/]*)/country/(?P<country_slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/page/(?P<page>\d+)/$', ConferenceThemeCatalog.as_view()),
url(r'^conference/theme/(?P<slug>[^/]*)/country/(?P<country_slug>[^/]*)/(?P<year>\d+)/page/(?P<page>\d+)/$', ConferenceThemeCatalog.as_view()),
url(r'^conference/theme/(?P<slug>[^/]*)/country/(?P<country_slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/$', ConferenceThemeCatalog.as_view()),
url(r'^conference/theme/(?P<slug>[^/]*)/country/(?P<country_slug>[^/]*)/page/(?P<page>\d+)/$', ConferenceThemeCatalog.as_view()),
url(r'^conference/theme/(?P<slug>[^/]*)/country/(?P<country_slug>[^/]*)/(?P<year>\d+)/$', ConferenceThemeCatalog.as_view()),
url(r'^conference/theme/(?P<slug>[^/]*)/country/(?P<country_slug>[^/]*)/$', ConferenceThemeCatalog.as_view()),
url(r'^conference/theme/(?P<slug>[^/]*)/city/(?P<city_slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/page/(?P<page>\d+)/$', ConferenceThemeCatalog.as_view()),
url(r'^conference/theme/(?P<slug>[^/]*)/city/(?P<city_slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/$', ConferenceThemeCatalog.as_view()),
url(r'^conference/theme/(?P<slug>[^/]*)/city/(?P<city_slug>[^/]*)/(?P<year>\d+)/page/(?P<page>\d+)/$', ConferenceThemeCatalog.as_view()),
url(r'^conference/theme/(?P<slug>[^/]*)/city/(?P<city_slug>[^/]*)/(?P<year>\d+)/$', ConferenceThemeCatalog.as_view()),
url(r'^conference/theme/(?P<slug>[^/]*)/city/(?P<city_slug>[^/]*)/page/(?P<page>\d+)/$', ConferenceThemeCatalog.as_view()),
url(r'^conference/theme/(?P<slug>[^/]*)/country/(?P<country_slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/page/(?P<page>\d+)/$',
ConferenceThemeCatalog.as_view(),
name='conference_theme_catalog_slug_countryslug_year_month_page'),
url(r'^conference/theme/(?P<slug>[^/]*)/country/(?P<country_slug>[^/]*)/(?P<year>\d+)/page/(?P<page>\d+)/$',
ConferenceThemeCatalog.as_view(),
name='conference_theme_catalog_slug_countryslug_year_page'),
url(r'^conference/theme/(?P<slug>[^/]*)/country/(?P<country_slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/$',
ConferenceThemeCatalog.as_view(),
name='conference_theme_catalog_slug_countryslug_year_month'),
url(r'^conference/theme/(?P<slug>[^/]*)/country/(?P<country_slug>[^/]*)/page/(?P<page>\d+)/$',
ConferenceThemeCatalog.as_view(),
name='conference_theme_catalog_slug_countryslug_page'),
url(r'^conference/theme/(?P<slug>[^/]*)/country/(?P<country_slug>[^/]*)/(?P<year>\d+)/$',
ConferenceThemeCatalog.as_view(),
name='conference_theme_catalog_slug_countryslug_year'),
url(r'^conference/theme/(?P<slug>[^/]*)/country/(?P<country_slug>[^/]*)/$',
ConferenceThemeCatalog.as_view(),
name='conference_theme_catalog_slug_countryslug'),
url(r'^conference/theme/(?P<slug>[^/]*)/city/(?P<city_slug>[^/]*)/page/(?P<page>\d+)/$', ConferenceThemeCatalog.as_view()),
url(r'^conference/theme/(?P<slug>[^/]*)/city/(?P<city_slug>[^/]*)/$', ConferenceThemeCatalog.as_view()),
url(r'^conference/theme/(?P<slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/page/(?P<page>\d+)/$', ConferenceThemeCatalog.as_view(), {'meta_id':31}),
url(r'^conference/theme/(?P<slug>[^/]*)/(?P<year>\d+)/page/(?P<page>\d+)/$', ConferenceThemeCatalog.as_view(), {'meta_id':30}),
url(r'^conference/theme/(?P<slug>[^/]*)/page/(?P<page>\d+)/$', ConferenceThemeCatalog.as_view(), {'meta_id':29}),
url(r'^conference/theme/(?P<slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/$', ConferenceThemeCatalog.as_view(), {'meta_id':31}),
url(r'^conference/theme/(?P<slug>[^/]*)/(?P<year>\d+)/$', ConferenceThemeCatalog.as_view(), {'meta_id':30}),
url(r'^conference/theme/(?P<slug>[^/]*)/$', ConferenceThemeCatalog.as_view(), {'meta_id':29}),
url(r'^conference/theme/(?P<slug>[^/]*)/city/(?P<city_slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/page/(?P<page>\d+)/$',
ConferenceThemeCatalog.as_view(),
name='conference_theme_catalog_slug_cityslug_year_month_page'),
url(r'^conference/theme/(?P<slug>[^/]*)/city/(?P<city_slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/$',
ConferenceThemeCatalog.as_view(),
name='conference_theme_catalog_slug_cityslug_year_month'),
url(r'^conference/theme/(?P<slug>[^/]*)/city/(?P<city_slug>[^/]*)/(?P<year>\d+)/page/(?P<page>\d+)/$',
ConferenceThemeCatalog.as_view(),
name='conference_theme_catalog_slug_cityslug_year_page'),
url(r'^conference/theme/(?P<slug>[^/]*)/city/(?P<city_slug>[^/]*)/(?P<year>\d+)/$',
ConferenceThemeCatalog.as_view(),
name='conference_theme_catalog_slug_cityslug_year'),
url(r'^conference/theme/(?P<slug>[^/]*)/city/(?P<city_slug>[^/]*)/page/(?P<page>\d+)/$',
ConferenceThemeCatalog.as_view(),
name='conference_theme_catalog_slug_cityslug_page'),
url(r'^conference/theme/(?P<slug>[^/]*)/city/(?P<city_slug>[^/]*)/$',
ConferenceThemeCatalog.as_view(),
name='conference_theme_catalog_slug_cityslug'),
url(r'^conference/theme/(?P<slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/page/(?P<page>\d+)/$',
ConferenceThemeCatalog.as_view(), {'meta_id':31},
name='conference_theme_catalog_slug_year_month_page'),
url(r'^conference/theme/(?P<slug>[^/]*)/(?P<year>\d+)/page/(?P<page>\d+)/$',
ConferenceThemeCatalog.as_view(), {'meta_id':30},
name='conference_theme_catalog_slug_year_page'),
url(r'^conference/theme/(?P<slug>[^/]*)/page/(?P<page>\d+)/$',
ConferenceThemeCatalog.as_view(), {'meta_id':29},
name='conference_theme_catalog_slug_page'),
url(r'^conference/theme/(?P<slug>[^/]*)/(?P<year>\d+)/(?P<month>[^/]*)/$',
ConferenceThemeCatalog.as_view(), {'meta_id':31},
name='conference_theme_catalog_slug_year_month'),
url(r'^conference/theme/(?P<slug>[^/]*)/(?P<year>\d+)/$',
ConferenceThemeCatalog.as_view(), {'meta_id':30},
name='conference_theme_catalog_slug_year'),
url(r'^conference/theme/(?P<slug>[^/]*)/$',
ConferenceThemeCatalog.as_view(), {'meta_id':29},
name='conference_theme_catalog_slug'),
# tag catalog
url(r'^conference/tag/$',
ConferenceByTag.as_view(), {'meta_id':50}, name='conference_tag'),

6
apps/conference/views.py
Unescape View File

@ -235,6 +235,7 @@ class ConferenceCountryCatalog(ConferenceCatalog):
class ConferenceCityCatalog(ConferenceCatalog):
catalog_url = '/conference/city/'
stat_kind = 'city'
def get_filtered_qs(self):
#this method used in parent get_queryset
slug = self.kwargs.get('slug')
@ -268,12 +269,13 @@ class ConferenceThemeCatalog(ConferenceCatalog):
qs = self.model.enable.upcoming().filter(theme=theme)
if country_slug:
country = get_object_or_404(Country, url=country_slug)
self.country = country
self.kwargs['country'] = country
qs = qs.filter(country=country)
if city_slug:
city = get_object_or_404(City, url=city_slug)
self.city = city
self.kwargs['city'] = city
qs = qs.filter(city=city)
self.filter_object = theme

10
proj/settings.py
Unescape View File

@ -480,11 +480,11 @@ BIT_AUDIENCE = (('experts', _(u'Специалисты')), ('experts and consume
('general public', _(u'Широкая публика')))
MONTHES = {'jan': {'value': 1, 'name': _(u'Январь')}, 'feb': {'value': 2, 'name': _(u'Февраль')},
'mar': {'value': 3, 'name': _(u'Март')}, 'apr': {'value': 4, 'name': _(u'Апрель')},
'may': {'value': 5, 'name': _(u'Май')}, 'jun': {'value': 6, 'name': _(u'Июнь')},
'jul': {'value': 7, 'name': _(u'Июль')}, 'aug': {'value': 8, 'name': _(u'Август')},
'sep': {'value': 9, 'name': _(u'Сентябрь')}, 'oct': {'value': 10, 'name': _(u'Октябрь')},
'nov': {'value': 11, 'name': _(u'Ноябрь')}, 'dec': {'value': 12, 'name': _(u'Декабрь')}}
'mar': {'value': 3, 'name': _(u'Март')}, 'apr': {'value': 4, 'name': _(u'Апрель')},
'may': {'value': 5, 'name': _(u'Май')}, 'jun': {'value': 6, 'name': _(u'Июнь')},
'jul': {'value': 7, 'name': _(u'Июль')}, 'aug': {'value': 8, 'name': _(u'Август')},
'sep': {'value': 9, 'name': _(u'Сентябрь')}, 'oct': {'value': 10, 'name': _(u'Октябрь')},
'nov': {'value': 11, 'name': _(u'Ноябрь')}, 'dec': {'value': 12, 'name': _(u'Декабрь')}}
SNG_COUNTRIES = [159, 186, 31, 6, 99, 13, 189, 64]
RUSSIA_PK = 159

Write Preview
Loading…
Cancel
Save