diff --git a/conference/urls.py b/conference/urls.py index 3b1c1757..157bb0de 100644 --- a/conference/urls.py +++ b/conference/urls.py @@ -47,11 +47,12 @@ urlpatterns = patterns('', # theme catalog url(r'^conference/theme/$', ConferenceByTheme.as_view(), {'meta_id':50}), url(r'^conference/theme/(?P.*)/country/(?P.*)/(?P\d+)/(?P.*)/page/(?P\d+)/$', ConferenceThemeCatalog.as_view()), - url(r'^conference/theme/(?P.*)/country/(?P.*)/(?P\d+)/(?P.*)/$', ConferenceThemeCatalog.as_view()), url(r'^conference/theme/(?P.*)/country/(?P.*)/(?P\d+)/page/(?P\d+)/$', ConferenceThemeCatalog.as_view()), - url(r'^conference/theme/(?P.*)/country/(?P.*)/(?P\d+)/$', ConferenceThemeCatalog.as_view()), + url(r'^conference/theme/(?P.*)/country/(?P.*)/(?P\d+)/(?P.*)/$', ConferenceThemeCatalog.as_view()), url(r'^conference/theme/(?P.*)/country/(?P.*)/page/(?P\d+)/$', ConferenceThemeCatalog.as_view()), + url(r'^conference/theme/(?P.*)/country/(?P.*)/(?P\d+)/$', ConferenceThemeCatalog.as_view()), url(r'^conference/theme/(?P.*)/country/(?P.*)/$', ConferenceThemeCatalog.as_view()), + url(r'^conference/theme/(?P.*)/city/(?P.*)/(?P\d+)/(?P.*)/page/(?P\d+)/$', ConferenceThemeCatalog.as_view()), url(r'^conference/theme/(?P.*)/city/(?P.*)/(?P\d+)/(?P.*)/$', ConferenceThemeCatalog.as_view()), url(r'^conference/theme/(?P.*)/city/(?P.*)/(?P\d+)/page/(?P\d+)/$', ConferenceThemeCatalog.as_view()), diff --git a/exposition/urls.py b/exposition/urls.py index a59253d0..8a0cd940 100644 --- a/exposition/urls.py +++ b/exposition/urls.py @@ -49,10 +49,10 @@ urlpatterns = patterns('', # theme catalog url(r'^expo/theme/$', ExpositionByTheme.as_view(), {'meta_id':55}), url(r'^expo/theme/(?P.*)/country/(?P.*)/(?P\d+)/(?P.*)/page/(?P\d+)/$', ExpoThemeCatalog.as_view(), {'meta_id':44}), - url(r'^expo/theme/(?P.*)/country/(?P.*)/(?P\d+)/(?P.*)/$', ExpoThemeCatalog.as_view(), {'meta_id':44}), url(r'^expo/theme/(?P.*)/country/(?P.*)/(?P\d+)/page/(?P\d+)/$', ExpoThemeCatalog.as_view(), {'meta_id':44}), - url(r'^expo/theme/(?P.*)/country/(?P.*)/(?P\d+)/$', ExpoThemeCatalog.as_view(), {'meta_id':44}), + url(r'^expo/theme/(?P.*)/country/(?P.*)/(?P\d+)/(?P.*)/$', ExpoThemeCatalog.as_view(), {'meta_id':44}), url(r'^expo/theme/(?P.*)/country/(?P.*)/page/(?P\d+)/$', ExpoThemeCatalog.as_view(), {'meta_id':44}), + url(r'^expo/theme/(?P.*)/country/(?P.*)/(?P\d+)/$', ExpoThemeCatalog.as_view(), {'meta_id':44}), url(r'^expo/theme/(?P.*)/country/(?P.*)/$', ExpoThemeCatalog.as_view(), {'meta_id':44}), url(r'^expo/theme/(?P.*)/city/(?P.*)/(?P\d+)/(?P.*)/page/(?P\d+)/$', ExpoThemeCatalog.as_view(), {'meta_id':42}), diff --git a/fabfile.py b/fabfile.py index 07c99232..d1207744 100644 --- a/fabfile.py +++ b/fabfile.py @@ -141,7 +141,7 @@ def stage4_firstrun(): run('git checkout -- proj/settings.py') pull(with_configs=True) run('python manage.py syncdb') - run('python manage.py migrate theme') + ticket1374() ticket1393() call_state('start')