diff --git a/build/urls.py b/build/urls.py index 789b93b..a9badd2 100644 --- a/build/urls.py +++ b/build/urls.py @@ -1,4 +1,4 @@ -# Copyright (C) 2017 The Sipwise Team - http://sipwise.com +# Copyright (C) 2017-2022 The Sipwise Team - http://sipwise.com # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -12,19 +12,19 @@ # # You should have received a copy of the GNU General Public License along # with this program. If not, see . -from django.conf.urls import url +from django.urls import re_path from . import views app_name = "build" urlpatterns = [ - url(r"^$", views.BuildReleaseList.as_view(), name="list"), - url( + re_path(r"^$", views.BuildReleaseList.as_view(), name="list"), + re_path( r"^(?P[0-9]+)/?$", views.BuildReleaseDetail.as_view(), name="detail", ), - url( + re_path( r"^(?P[^/]+)/(?P[^/]+)/$", views.BuildProject.as_view(), name="build_project", diff --git a/panel/urls.py b/panel/urls.py index 01d1537..df70487 100644 --- a/panel/urls.py +++ b/panel/urls.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 The Sipwise Team - http://sipwise.com +# Copyright (C) 2015-2022 The Sipwise Team - http://sipwise.com # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -12,28 +12,28 @@ # # You should have received a copy of the GNU General Public License along # with this program. If not, see . -from django.conf.urls import url +from django.urls import re_path from . import views app_name = "panel" urlpatterns = [ - url(r"^$", views.index, name="index"), - url( + re_path(r"^$", views.index, name="index"), + re_path( r"^release/(?P<_uuid>[^/]+)/$", views.release_uuid, name="release-uuid" ), - url(r"^(?P<_release>[^/]+)/$", views.release, name="release-view"), - url( + re_path(r"^(?P<_release>[^/]+)/$", views.release, name="release-view"), + re_path( r"^(?P<_release>[^/]+)/(?P<_project>[^/]+)/$", views.project, name="project-view", ), - url( + re_path( r"^(?P<_release>[^/]+)/(?P<_project>[^/]+)/latest/$", views.latest_uuid, name="latest_uuid-view", ), - url( + re_path( r"^(?P<_release>[^/]+)/(?P<_project>[^/]+)/(?P<_uuid>[^/]+)/$", views.uuid, name="uuid-view", diff --git a/release_changed/urls.py b/release_changed/urls.py index d0bdb32..fd8751a 100644 --- a/release_changed/urls.py +++ b/release_changed/urls.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 The Sipwise Team - http://sipwise.com +# Copyright (C) 2020-2022 The Sipwise Team - http://sipwise.com # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -12,19 +12,19 @@ # # You should have received a copy of the GNU General Public License along # with this program. If not, see . -from django.conf.urls import url +from django.urls import re_path from . import views app_name = "release_changed" urlpatterns = [ - url(r"^$", views.ReleaseChangedList.as_view(), name="list"), - url( + re_path(r"^$", views.ReleaseChangedList.as_view(), name="list"), + re_path( r"^(?P[0-9]+)/?$", views.ReleaseChangedDetail.as_view(), name="detail", ), - url( + re_path( r"^(?P