fixes in urls

remotes/origin/stepan-k
Stepan Krapivin 8 years ago
parent 1fd6ce5180
commit 3f352e2cc8
  1. 9
      batiskaf/settings.py
  2. 5
      batiskaf/urls.py

@ -35,7 +35,12 @@ DEBUG = (platform.node() != 'Batiskaf')
TEMPLATE_DEBUG = DEBUG TEMPLATE_DEBUG = DEBUG
ALLOWED_HOSTS = ['batiskaf.kz', 'www.batiskaf.kz', 'batiskaf-kz.kz', 'www.batiskaf-kz.kz'] ALLOWED_HOSTS = [
'batiskaf.kz',
'www.batiskaf.kz',
'batiskaf-kz.kz',
'www.batiskaf-kz.kz'
]
MESSAGE_TAGS = { MESSAGE_TAGS = {
messages.INFO: 'info', messages.INFO: 'info',
@ -60,7 +65,7 @@ INSTALLED_APPS = (
'django.contrib.postgres', 'django.contrib.postgres',
'django.contrib.sitemaps', 'django.contrib.sitemaps',
'django.contrib.sites', 'django.contrib.sites',
#'django_extensions', # 'django_extensions',
'watermarker', 'watermarker',
'rest_framework', 'rest_framework',
'easy_thumbnails', 'easy_thumbnails',

@ -65,7 +65,7 @@ sitemaps1 = {
'categories': CategorySitemap, 'categories': CategorySitemap,
} }
urlpatterns = ( urlpatterns = [
url(r'^$', 'main.views.index', url(r'^$', 'main.views.index',
name='index'), name='index'),
url(r'^sitemap\.xml$', sitemap, {'sitemaps': sitemaps1}, url(r'^sitemap\.xml$', sitemap, {'sitemaps': sitemaps1},
@ -101,6 +101,7 @@ urlpatterns = (
url(r'^api/item/(?P<article>.+)/$', 'main.views.temp_count_update', name='temp_count_update'), url(r'^api/item/(?P<article>.+)/$', 'main.views.temp_count_update', name='temp_count_update'),
url(r'^api/', include(router.urls)), url(r'^api/', include(router.urls)),
url(r'^news/', include('news.urls')), url(r'^news/', include('news.urls')),
url(r'^dtys/', include('dtys.urls')),
url(r'^promo/', include('promo.urls')), url(r'^promo/', include('promo.urls')),
# url(r'^get_order_amount/$', 'store.views.get_order_amount'), # url(r'^get_order_amount/$', 'store.views.get_order_amount'),
url(r'^get_order_kazpost_amount/$', 'store.views.get_order_kazpost_amount'), url(r'^get_order_kazpost_amount/$', 'store.views.get_order_kazpost_amount'),
@ -129,4 +130,4 @@ urlpatterns = (
url(r'^fest_success/$', fest_success, name='fest_success'), url(r'^fest_success/$', fest_success, name='fest_success'),
url(r'^currencies/(?P<currency_code>.+)/$', set_currency, name='set_currency'), url(r'^currencies/(?P<currency_code>.+)/$', set_currency, name='set_currency'),
url(r'^admin2517_garpun/', include(admin.site.urls)), url(r'^admin2517_garpun/', include(admin.site.urls)),
) ]

Loading…
Cancel
Save