ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

dynamicweb: hotfix railshosting

Browse source
This commit is contained in:
rascencio 2015-09-22 05:28:34 -06:00
parent 8a4b1a0c92
commit 0a83b1494d
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dynamicweb/urls.py
View file

@ -2,24 +2,21 @@ from django.conf.urls import patterns, include, url
from django.contrib import admin from django.contrib import admin
# deprecated in version 1.8 # deprecated in version 1.8
from django.conf.urls.static import static from django.conf.urls.static import static
# i18n
from django.conf.urls.i18n import i18n_patterns
from dynamicweb import settings from dynamicweb import settings
from hosting.views import railshosting
urlpatterns = [ urlpatterns = [
url(r'^digitalglarus/', include('digitalglarus.urls', url(r'^digitalglarus/', include('digitalglarus.urls',
namespace="digitalglarus")), namespace="digitalglarus")),
url(r'^hosting/', include('hosting.urls', namespace="hosting")), url(r'^hosting/', include('hosting.urls', namespace="hosting")),
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')), url(r'^railshosting/', railshosting, name="rails.hosting"),
url(r'^jsi18n/(?P<packages>\S+?)/$', 'django.views.i18n.javascript_catalog'),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
# note the django CMS URLs included via i18n_patterns
urlpatterns += i18n_patterns('',
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
url(r'^', include('cms.urls')), url(r'^', include('cms.urls')),
) url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
url(r'^jsi18n/(?P<packages>\S+?)/$',
'django.views.i18n.javascript_catalog'),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
if settings.DEBUG: if settings.DEBUG:
urlpatterns += patterns('', urlpatterns += patterns('',