0001-general-update-urls.py-for-django-1.11-20933.patch
| hobo/emails/urls.py | ||
|---|---|---|
| 14 | 14 |
# You should have received a copy of the GNU Affero General Public License |
| 15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | 16 | |
| 17 |
from django.conf.urls import patterns, url
|
|
| 17 |
from django.conf.urls import url |
|
| 18 | 18 | |
| 19 | 19 |
from . import views |
| 20 | 20 | |
| 21 |
urlpatterns = patterns('',
|
|
| 21 |
urlpatterns = [
|
|
| 22 | 22 |
url(r'^$', views.home, name='emails-home'), |
| 23 |
) |
|
| 23 |
] |
|
| hobo/environment/urls.py | ||
|---|---|---|
| 1 |
from django.conf.urls import patterns, url
|
|
| 1 |
from django.conf.urls import url |
|
| 2 | 2 | |
| 3 | 3 |
from .views import * |
| 4 | 4 | |
| 5 |
urlpatterns = patterns('',
|
|
| 5 |
urlpatterns = [
|
|
| 6 | 6 |
url(r'^$', HomeView.as_view(), name='environment-home'), |
| 7 | 7 |
url(r'^variables$', VariablesView.as_view(), name='environment-variables'), |
| 8 | 8 |
url(r'^new-variable$', VariableCreateView.as_view(), name='new-variable',), |
| ... | ... | |
| 19 | 19 |
url(r'^new-variable-(?P<service>\w+)/(?P<slug>[\w-]+)$', |
| 20 | 20 |
VariableCreateView.as_view(), name='new-variable-service',), |
| 21 | 21 |
url(r'^debug.json$', debug_json, name='debug-json'), |
| 22 |
) |
|
| 22 |
] |
|
| hobo/profile/urls.py | ||
|---|---|---|
| 14 | 14 |
# You should have received a copy of the GNU Affero General Public License |
| 15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | 16 | |
| 17 |
from django.conf.urls import patterns, url
|
|
| 17 |
from django.conf.urls import url |
|
| 18 | 18 | |
| 19 | 19 |
from . import views |
| 20 | 20 | |
| 21 |
urlpatterns = patterns('',
|
|
| 21 |
urlpatterns = [
|
|
| 22 | 22 |
url(r'^$', views.home, name='profile-home'), |
| 23 | 23 |
url(r'(?P<name>[\w-]+)/options', views.options, name='profile-attribute-options'), |
| 24 | 24 |
url(r'^reorder$', views.reorder, name='profile-reorder'), |
| 25 | 25 |
url(r'^add-attribute$', views.add_attribute, name='profile-add-attribute'), |
| 26 |
) |
|
| 26 |
] |
|
| hobo/theme/urls.py | ||
|---|---|---|
| 14 | 14 |
# You should have received a copy of the GNU Affero General Public License |
| 15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | 16 | |
| 17 |
from django.conf.urls import patterns, url
|
|
| 17 |
from django.conf.urls import url |
|
| 18 | 18 | |
| 19 | 19 |
from . import views |
| 20 | 20 | |
| 21 |
urlpatterns = patterns('',
|
|
| 21 |
urlpatterns = [
|
|
| 22 | 22 |
url(r'^$', views.home, name='theme-home'), |
| 23 | 23 |
url(r'^select$', views.select, name='theme-select'), |
| 24 | 24 |
url(r'^options$', views.options, name='theme-options'), |
| 25 |
) |
|
| 25 |
] |
|
| hobo/urls.py | ||
|---|---|---|
| 1 | 1 |
from django.conf import settings |
| 2 |
from django.conf.urls import patterns, include, url
|
|
| 2 |
from django.conf.urls import include, url |
|
| 3 | 3 | |
| 4 | 4 |
from django.contrib import admin |
| 5 | 5 |
admin.autodiscover() |
| 6 | 6 | |
| 7 |
from .views import admin_required, login, login_local, logout |
|
| 7 |
from .views import admin_required, login, login_local, logout, home, menu_json, hobo
|
|
| 8 | 8 |
from .urls_utils import decorated_includes |
| 9 | 9 |
from .environment.urls import urlpatterns as environment_urls |
| 10 | 10 |
from .profile.urls import urlpatterns as profile_urls |
| 11 | 11 |
from .theme.urls import urlpatterns as theme_urls |
| 12 | 12 |
from .emails.urls import urlpatterns as emails_urls |
| 13 | 13 | |
| 14 |
urlpatterns = patterns('',
|
|
| 15 |
url(r'^$', 'hobo.views.home', name='home'),
|
|
| 14 |
urlpatterns = [
|
|
| 15 |
url(r'^$', home, name='home'),
|
|
| 16 | 16 |
url(r'^sites/', decorated_includes(admin_required, |
| 17 | 17 |
include(environment_urls))), |
| 18 | 18 |
url(r'^profile/', decorated_includes(admin_required, |
| ... | ... | |
| 20 | 20 |
url(r'^theme/', decorated_includes(admin_required, |
| 21 | 21 |
include(theme_urls))), |
| 22 | 22 |
url(r'^emails/', decorated_includes(admin_required, include(emails_urls))), |
| 23 |
url(r'^menu.json$', 'hobo.views.menu_json', name='menu_json'),
|
|
| 24 |
url(r'^hobos.json$', 'hobo.views.hobo'),
|
|
| 23 |
url(r'^menu.json$', menu_json, name='menu_json'),
|
|
| 24 |
url(r'^hobos.json$', hobo),
|
|
| 25 | 25 |
url(r'^admin/', include(admin.site.urls)), |
| 26 |
) |
|
| 26 |
] |
|
| 27 | 27 | |
| 28 | 28 |
# add authentication patterns |
| 29 |
urlpatterns += patterns('',
|
|
| 29 |
urlpatterns += [
|
|
| 30 | 30 |
url(r'^logout/$', logout, name='logout'), |
| 31 | 31 |
url(r'^login/$', login, name='auth_login'), |
| 32 | 32 |
url(r'^login/local/$', login_local), # to be used as backup, in case of idp down |
| 33 | 33 |
url(r'^accounts/mellon/', include('mellon.urls')),
|
| 34 |
) |
|
| 34 |
] |
|
| 35 | ||
| 35 | 36 |
if 'hobo.contrib.ozwillo' in settings.INSTALLED_APPS: |
| 36 |
urlpatterns += patterns('',
|
|
| 37 |
urlpatterns += [
|
|
| 37 | 38 |
url(r'ozwillo/', include('hobo.contrib.ozwillo.urls')),
|
| 38 |
) |
|
| 39 |
] |
|
| 39 |
- |
|