From 71e20fc78bed462d18e0bbe0741e8571fb5710f0 Mon Sep 17 00:00:00 2001
From: Alexander Burdeiny <bonus_05@mail.ru>
Date: Tue, 28 Jun 2016 12:21:13 +0300
Subject: [PATCH] =?UTF-8?q?1381:=20=D0=AD=D1=82=D0=B0=D0=BF=20=E2=84=964?=
 =?UTF-8?q?=20-=20=D0=9F=D0=BE=D0=BB=D0=BE=D0=BC=D0=B0=D0=BD=D0=BD=D1=8B?=
 =?UTF-8?q?=D0=B9=20=D0=BF=D0=B0=D0=B3=D0=B8=D0=BD=D0=B0=D1=82=D0=BE=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conference/urls.py | 5 +++--
 exposition/urls.py | 4 ++--
 fabfile.py         | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

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<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+)/(?P<month>.*)/$', 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+)/$', 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()),
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<slug>.*)/country/(?P<country_slug>.*)/(?P<year>\d+)/(?P<month>.*)/page/(?P<page>\d+)/$', ExpoThemeCatalog.as_view(), {'meta_id':44}),
-    url(r'^expo/theme/(?P<slug>.*)/country/(?P<country_slug>.*)/(?P<year>\d+)/(?P<month>.*)/$', ExpoThemeCatalog.as_view(), {'meta_id':44}),
     url(r'^expo/theme/(?P<slug>.*)/country/(?P<country_slug>.*)/(?P<year>\d+)/page/(?P<page>\d+)/$', ExpoThemeCatalog.as_view(), {'meta_id':44}),
-    url(r'^expo/theme/(?P<slug>.*)/country/(?P<country_slug>.*)/(?P<year>\d+)/$', ExpoThemeCatalog.as_view(), {'meta_id':44}),
+    url(r'^expo/theme/(?P<slug>.*)/country/(?P<country_slug>.*)/(?P<year>\d+)/(?P<month>.*)/$', ExpoThemeCatalog.as_view(), {'meta_id':44}),
     url(r'^expo/theme/(?P<slug>.*)/country/(?P<country_slug>.*)/page/(?P<page>\d+)/$', ExpoThemeCatalog.as_view(), {'meta_id':44}),
+    url(r'^expo/theme/(?P<slug>.*)/country/(?P<country_slug>.*)/(?P<year>\d+)/$', ExpoThemeCatalog.as_view(), {'meta_id':44}),
     url(r'^expo/theme/(?P<slug>.*)/country/(?P<country_slug>.*)/$', ExpoThemeCatalog.as_view(), {'meta_id':44}),
 
     url(r'^expo/theme/(?P<slug>.*)/city/(?P<city_slug>.*)/(?P<year>\d+)/(?P<month>.*)/page/(?P<page>\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')