entrouvert
/
zoo
17
0
Fork 0
Code Issues Pull Requests Releases Activity

dj32: replace use of url by re_path (#74843)

This commit is contained in:
Benjamin Dauvergne 2023-02-24 17:38:38 +01:00
parent 9dc5a2d801
commit 470fea47c3
4 changed files with 44 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
zoo/urls.py
View File

@ -14,30 +14,15 @@
# You should have received a copy of the GNU Affero General Public License # 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/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
"""zoo URL Configuration from django.urls import re_path, include
The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/1.10/topics/http/urls/
Examples:
Function views
1. Add an import: from my_app import views
2. Add a URL to urlpatterns: url(r'^$', views.home, name='home')
Class-based views
1. Add an import: from other_app.views import Home
2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home')
Including another URLconf
1. Import the include() function: from django.conf.urls import url, include
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
"""
from django.conf.urls import url, include
from django.contrib import admin from django.contrib import admin
from .views import login, logout from .views import login, logout
urlpatterns = [ urlpatterns = [
url(r'^admin/', admin.site.urls), re_path(r'^admin/', admin.site.urls),
url(r'^demo/', include('zoo.zoo_demo.urls')), re_path(r'^demo/', include('zoo.zoo_demo.urls')),
url(r'^rsu/', include('zoo.zoo_nanterre.urls')), re_path(r'^rsu/', include('zoo.zoo_nanterre.urls')),
url(r'^logout/$', logout, name='logout'), re_path(r'^logout/$', logout, name='logout'),
url(r'^login/$', login, name='auth_login'), re_path(r'^login/$', login, name='auth_login'),
] ]

6
zoo/zoo_demo/urls.py
View File

@ -14,11 +14,11 @@
# You should have received a copy of the GNU Affero General Public License # 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/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from django.conf.urls import url from django.urls import re_path
from .views import schemas, schema from .views import schemas, schema
urlpatterns = [ urlpatterns = [
url(r'^schemas/$', schemas, name='demo-schemas'), re_path(r'^schemas/$', schemas, name='demo-schemas'),
url(r'^schemas/(?P<name>\w*)/$', schema, name='demo-schema'), re_path(r'^schemas/(?P<name>\w*)/$', schema, name='demo-schema'),
] ]

6
zoo/zoo_nanterre/apps.py
View File

@ -19,7 +19,7 @@
import functools import functools
from django.apps import AppConfig from django.apps import AppConfig
from django.conf.urls import url from django.urls import re_path
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django.db.models.signals import post_migrate from django.db.models.signals import post_migrate
@ -93,14 +93,14 @@ class ZooNanterreConfig(AppConfig):
urls = [] urls = []
for desc in descs: for desc in descs:
urls.append(url( urls.append(re_path(
r'^synchronize-federations/%s$' % desc['re'], r'^synchronize-federations/%s$' % desc['re'],
model_admin.admin_site.admin_view( model_admin.admin_site.admin_view(
getattr(views, 'synchronize_federations' + desc['view'])), getattr(views, 'synchronize_federations' + desc['view'])),
kwargs={'model_admin': model_admin}, kwargs={'model_admin': model_admin},
name='synchronize-federations' + desc['name'], name='synchronize-federations' + desc['name'],
)) ))
urls.append(url( urls.append(re_path(
r'^inactive/', r'^inactive/',
model_admin.admin_site.admin_view( model_admin.admin_site.admin_view(
getattr(views, 'inactive_index')), getattr(views, 'inactive_index')),

64
zoo/zoo_nanterre/urls.py
View File

@ -14,74 +14,74 @@
# You should have received a copy of the GNU Affero General Public License # 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/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from django.conf.urls import url from django.urls import re_path
from .views import demo, search, import_control from .views import demo, search, import_control
from . import api_views from . import api_views
urlpatterns = [ urlpatterns = [
url(r'^demo/$', demo, name='demo'), re_path(r'^demo/$', demo, name='demo'),
url(r'^demo/search/$', search, name='demo'), re_path(r'^demo/search/$', search, name='demo'),
url(r'^import_control/$', import_control, name='demo'), re_path(r'^import_control/$', import_control, name='demo'),
url(r'^search/$', api_views.search, name='rsu-api-search'), re_path(r'^search/$', api_views.search, name='rsu-api-search'),
url(r'^individu/(?P<identifier>[-\w]+)/$', api_views.reseau, name='rsu-api-reseau'), re_path(r'^individu/(?P<identifier>[-\w]+)/$', api_views.reseau, name='rsu-api-reseau'),
url(r'^individu/(?P<identifier>[-\w]+)/suppression/$', api_views.suppression_individu, re_path(r'^individu/(?P<identifier>[-\w]+)/suppression/$', api_views.suppression_individu,
name='rsu-api-suppression-individu'), name='rsu-api-suppression-individu'),
url(r'^individu/(?P<identifier>[-\w]+)/liste/$', api_views.reseau_liste, re_path(r'^individu/(?P<identifier>[-\w]+)/liste/$', api_views.reseau_liste,
name='rsu-api-reseau-liste'), name='rsu-api-reseau-liste'),
url(r'^individu/(?P<identifier>[-\w]+)/journal/$', api_views.journal, name='rsu-api-journal'), re_path(r'^individu/(?P<identifier>[-\w]+)/journal/$', api_views.journal, name='rsu-api-journal'),
url(r'^individu/(?P<identifier>[-\w]+)/declaration-responsabilite-legale/$', re_path(r'^individu/(?P<identifier>[-\w]+)/declaration-responsabilite-legale/$',
api_views.declaration_responsabilite_legale, api_views.declaration_responsabilite_legale,
name='rsu-api-declaration-responsabilite-legale'), name='rsu-api-declaration-responsabilite-legale'),
url(r'^individu/(?P<identifier>[-\w]+)/declaration-adresse-principale/$', re_path(r'^individu/(?P<identifier>[-\w]+)/declaration-adresse-principale/$',
api_views.declaration_adresse_principale, api_views.declaration_adresse_principale,
name='rsu-api-declaration-adresse-principale'), name='rsu-api-declaration-adresse-principale'),
url(r'^individu/(?P<identifier>[-\w]+)/changement-de-situation-maritale/$', re_path(r'^individu/(?P<identifier>[-\w]+)/changement-de-situation-maritale/$',
api_views.changement_de_situation_maritale, api_views.changement_de_situation_maritale,
name='rsu-api-changement-de-situation-maritale'), name='rsu-api-changement-de-situation-maritale'),
url(r'^individu/(?P<identifier>[-\w]+)/separation/$', re_path(r'^individu/(?P<identifier>[-\w]+)/separation/$',
api_views.separation, name='rsu-api-separation'), api_views.separation, name='rsu-api-separation'),
url(r'^individu/(?P<identifier>[-\w]+)/declaration-de-deces/$', re_path(r'^individu/(?P<identifier>[-\w]+)/declaration-de-deces/$',
api_views.declaration_de_deces, name='rsu-api-declaration-de-deces'), api_views.declaration_de_deces, name='rsu-api-declaration-de-deces'),
url(r'^individu/(?P<identifier>[-\w]+)/(?P<identifier_enfant>[-\w]+)/' re_path(r'^individu/(?P<identifier>[-\w]+)/(?P<identifier_enfant>[-\w]+)/'
'suppression-lien-de-responsabilite/$', 'suppression-lien-de-responsabilite/$',
api_views.suppression_lien_de_responsabilite, api_views.suppression_lien_de_responsabilite,
name='rsu-api-suppression-lien-de-responsabilite'), name='rsu-api-suppression-lien-de-responsabilite'),
url(r'^individu/$', api_views.create_individu, name='rsu-api-create-individu'), re_path(r'^individu/$', api_views.create_individu, name='rsu-api-create-individu'),
url(r'^individu/(?P<identifier>[-\w]+)/federation/(?P<application>\w+)/$', api_views.federation, re_path(r'^individu/(?P<identifier>[-\w]+)/federation/(?P<application>\w+)/$', api_views.federation,
name='rsu-api-federation'), name='rsu-api-federation'),
url(r'^declaration-union/$', api_views.declaration_union, re_path(r'^declaration-union/$', api_views.declaration_union,
name='rsu-api-declaration-union'), name='rsu-api-declaration-union'),
url(r'^synchronisation/$', api_views.synchronization, re_path(r'^synchronisation/$', api_views.synchronization,
name='rsu-api-synchronization'), name='rsu-api-synchronization'),
url(r'^saga/retour-asynchrone/$', api_views.saga_retour_asynchrone, re_path(r'^saga/retour-asynchrone/$', api_views.saga_retour_asynchrone,
name='rsu-api-saga-retour-asynchrone'), name='rsu-api-saga-retour-asynchrone'),
url(r'^saga/retour-synchrone/$', api_views.saga_retour_synchrone, re_path(r'^saga/retour-synchrone/$', api_views.saga_retour_synchrone,
name='rsu-api-saga-retour-synchrone'), name='rsu-api-saga-retour-synchrone'),
url(r'^saga/tiers/(?P<application>\w+)/(?P<identifier>[-\w]+)/$', api_views.saga_tiers, re_path(r'^saga/tiers/(?P<application>\w+)/(?P<identifier>[-\w]+)/$', api_views.saga_tiers,
name='rsu-api-saga-tiers'), name='rsu-api-saga-tiers'),
url(r'^saga/(?P<identifier>[-\w]+)/factures/$', api_views.saga_factures, re_path(r'^saga/(?P<identifier>[-\w]+)/factures/$', api_views.saga_factures,
name='rsu-api-saga-factures'), name='rsu-api-saga-factures'),
url(r'^saga/(?P<identifier>[-\w]+)/transaction/$', api_views.saga_transaction, re_path(r'^saga/(?P<identifier>[-\w]+)/transaction/$', api_views.saga_transaction,
name='rsu-api-saga-transaction'), name='rsu-api-saga-transaction'),
url(r'^qf/lire-quotients-valides/$', api_views.qf_lire_quotiens_valides, re_path(r'^qf/lire-quotients-valides/$', api_views.qf_lire_quotiens_valides,
name='rsu-api-qf-lire-quotients-valides'), name='rsu-api-qf-lire-quotients-valides'),
url(r'^qf/simuler/$', api_views.qf_simuler, re_path(r'^qf/simuler/$', api_views.qf_simuler,
name='rsu-api-qf-simuler'), name='rsu-api-qf-simuler'),
url(r'^qf/(?P<identifier>[-\w]+)/$', api_views.qf_calculer, re_path(r'^qf/(?P<identifier>[-\w]+)/$', api_views.qf_calculer,
name='rsu-api-qf-calculer'), name='rsu-api-qf-calculer'),
url(r'^qf/(?P<identifier>[-\w]+)/editer-carte/(?P<id_qf>\w+)/$', api_views.qf_editer_carte, re_path(r'^qf/(?P<identifier>[-\w]+)/editer-carte/(?P<id_qf>\w+)/$', api_views.qf_editer_carte,
name='rsu-api-qf-editer-carte'), name='rsu-api-qf-editer-carte'),
url(r'^doublons/$', api_views.doublons, re_path(r'^doublons/$', api_views.doublons,
name='rsu-api-doublons'), name='rsu-api-doublons'),
url(r'^doublons/(?P<doublon_id>[0-9 ]+)/$', api_views.doublon, re_path(r'^doublons/(?P<doublon_id>[0-9 ]+)/$', api_views.doublon,
name='rsu-api-doublon'), name='rsu-api-doublon'),
url(r'^doublons/(?P<doublon_id>[0-9 ]+)/false-positive/$', api_views.false_positive, re_path(r'^doublons/(?P<doublon_id>[0-9 ]+)/false-positive/$', api_views.false_positive,
name='rsu-api-doublon-false-positive'), name='rsu-api-doublon-false-positive'),
url(r'^doublons/(?P<doublon_id>[0-9 ]+)/dedup/$', api_views.dedup, re_path(r'^doublons/(?P<doublon_id>[0-9 ]+)/dedup/$', api_views.dedup,
name='rsu-api-doublon-dedup'), name='rsu-api-doublon-dedup'),
] ]