Projet

Général

Profil

0003-urls-coding-style-29240.patch

Benjamin Dauvergne, 07 juin 2019 22:20

Télécharger (3,26 ko)

Voir les différences:

Subject: [PATCH 03/10] urls: coding style (#29240)

 hobo/urls.py | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)
hobo/urls.py
1
# hobo - portal to configure and deploy applications
2
# Copyright (C) 2015-2019  Entr'ouvert
3
#
4
# This program is free software: you can redistribute it and/or modify it
5
# under the terms of the GNU Affero General Public License as published
6
# by the Free Software Foundation, either version 3 of the License, or
7
# (at your option) any later version.
8
#
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU Affero General Public License for more details.
13
#
14
# You should have received a copy of the GNU Affero General Public License
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16

  
1 17
from django.conf import settings
2 18
from django.conf.urls import include, url
3 19

  
4 20
from django.contrib import admin
5
admin.autodiscover()
6 21

  
7 22
from .views import admin_required, login, login_local, logout, home, health_json, menu_json, hobo
8 23
from .urls_utils import decorated_includes
......
13 28
from .theme.urls import urlpatterns as theme_urls
14 29
from .emails.urls import urlpatterns as emails_urls
15 30

  
31
admin.autodiscover()
32

  
16 33
urlpatterns = [
17 34
    url(r'^$', home, name='home'),
18
    url(r'^sites/', decorated_includes(admin_required,
19
                                       include(environment_urls))),
20
    url(r'^profile/', decorated_includes(admin_required,
21
                                             include(profile_urls))),
22
    url(r'^franceconnect/',
23
        decorated_includes(admin_required, include(franceconnect_urls))),
24
    url(r'^matomo/',
25
        decorated_includes(admin_required, include(matomo_urls))),
26
    url(r'^theme/', decorated_includes(admin_required,
27
                                             include(theme_urls))),
35
    url(r'^sites/', decorated_includes(admin_required, include(environment_urls))),
36
    url(r'^profile/', decorated_includes(admin_required, include(profile_urls))),
37
    url(r'^franceconnect/', decorated_includes(admin_required, include(franceconnect_urls))),
38
    url(r'^matomo/', decorated_includes(admin_required, include(matomo_urls))),
39
    url(r'^theme/', decorated_includes(admin_required, include(theme_urls))),
28 40
    url(r'^emails/', decorated_includes(admin_required, include(emails_urls))),
29 41
    url(r'^api/health/$', health_json, name='health-json'),
30 42
    url(r'^menu.json$', menu_json, name='menu_json'),
......
36 48
urlpatterns += [
37 49
    url(r'^logout/$', logout, name='logout'),
38 50
    url(r'^login/$', login, name='auth_login'),
39
    url(r'^login/local/$', login_local), # to be used as backup, in case of idp down
51
    url(r'^login/local/$', login_local),  # to be used as backup, in case of idp down
40 52
    url(r'^accounts/mellon/', include('mellon.urls')),
41 53
]
42 54

  
43
-