general: update urls.py for django 1.11 (#20933)
This commit is contained in:
parent
4dda39a6bf
commit
5a15dd034a
|
@ -14,10 +14,10 @@
|
|||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from . import views
|
||||
|
||||
urlpatterns = patterns('',
|
||||
urlpatterns = [
|
||||
url(r'^$', views.home, name='emails-home'),
|
||||
)
|
||||
]
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .views import *
|
||||
|
||||
urlpatterns = patterns('',
|
||||
urlpatterns = [
|
||||
url(r'^$', HomeView.as_view(), name='environment-home'),
|
||||
url(r'^variables$', VariablesView.as_view(), name='environment-variables'),
|
||||
url(r'^new-variable$', VariableCreateView.as_view(), name='new-variable',),
|
||||
|
@ -19,4 +19,4 @@ urlpatterns = patterns('',
|
|||
url(r'^new-variable-(?P<service>\w+)/(?P<slug>[\w-]+)$',
|
||||
VariableCreateView.as_view(), name='new-variable-service',),
|
||||
url(r'^debug.json$', debug_json, name='debug-json'),
|
||||
)
|
||||
]
|
||||
|
|
|
@ -14,13 +14,13 @@
|
|||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from . import views
|
||||
|
||||
urlpatterns = patterns('',
|
||||
urlpatterns = [
|
||||
url(r'^$', views.home, name='profile-home'),
|
||||
url(r'(?P<name>[\w-]+)/options', views.options, name='profile-attribute-options'),
|
||||
url(r'^reorder$', views.reorder, name='profile-reorder'),
|
||||
url(r'^add-attribute$', views.add_attribute, name='profile-add-attribute'),
|
||||
)
|
||||
]
|
||||
|
|
|
@ -14,12 +14,12 @@
|
|||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from . import views
|
||||
|
||||
urlpatterns = patterns('',
|
||||
urlpatterns = [
|
||||
url(r'^$', views.home, name='theme-home'),
|
||||
url(r'^select$', views.select, name='theme-select'),
|
||||
url(r'^options$', views.options, name='theme-options'),
|
||||
)
|
||||
]
|
||||
|
|
23
hobo/urls.py
23
hobo/urls.py
|
@ -1,18 +1,18 @@
|
|||
from django.conf import settings
|
||||
from django.conf.urls import patterns, include, url
|
||||
from django.conf.urls import include, url
|
||||
|
||||
from django.contrib import admin
|
||||
admin.autodiscover()
|
||||
|
||||
from .views import admin_required, login, login_local, logout
|
||||
from .views import admin_required, login, login_local, logout, home, menu_json, hobo
|
||||
from .urls_utils import decorated_includes
|
||||
from .environment.urls import urlpatterns as environment_urls
|
||||
from .profile.urls import urlpatterns as profile_urls
|
||||
from .theme.urls import urlpatterns as theme_urls
|
||||
from .emails.urls import urlpatterns as emails_urls
|
||||
|
||||
urlpatterns = patterns('',
|
||||
url(r'^$', 'hobo.views.home', name='home'),
|
||||
urlpatterns = [
|
||||
url(r'^$', home, name='home'),
|
||||
url(r'^sites/', decorated_includes(admin_required,
|
||||
include(environment_urls))),
|
||||
url(r'^profile/', decorated_includes(admin_required,
|
||||
|
@ -20,19 +20,20 @@ urlpatterns = patterns('',
|
|||
url(r'^theme/', decorated_includes(admin_required,
|
||||
include(theme_urls))),
|
||||
url(r'^emails/', decorated_includes(admin_required, include(emails_urls))),
|
||||
url(r'^menu.json$', 'hobo.views.menu_json', name='menu_json'),
|
||||
url(r'^hobos.json$', 'hobo.views.hobo'),
|
||||
url(r'^menu.json$', menu_json, name='menu_json'),
|
||||
url(r'^hobos.json$', hobo),
|
||||
url(r'^admin/', include(admin.site.urls)),
|
||||
)
|
||||
]
|
||||
|
||||
# add authentication patterns
|
||||
urlpatterns += patterns('',
|
||||
urlpatterns += [
|
||||
url(r'^logout/$', logout, name='logout'),
|
||||
url(r'^login/$', login, name='auth_login'),
|
||||
url(r'^login/local/$', login_local), # to be used as backup, in case of idp down
|
||||
url(r'^accounts/mellon/', include('mellon.urls')),
|
||||
)
|
||||
]
|
||||
|
||||
if 'hobo.contrib.ozwillo' in settings.INSTALLED_APPS:
|
||||
urlpatterns += patterns('',
|
||||
urlpatterns += [
|
||||
url(r'ozwillo/', include('hobo.contrib.ozwillo.urls')),
|
||||
)
|
||||
]
|
||||
|
|
Loading…
Reference in New Issue