entrouvert
/
chrono
14
1
Fork 0
Code Issues Pull Requests 5 Releases Wiki Activity

misc: update urls.py to remove patterns usage (#15972)

This commit is contained in:
Frédéric Péters 2017-04-24 14:01:16 +02:00
parent 11c9c33629
commit 3ddd583c56
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chrono/api/urls.py
View File

@ -14,11 +14,11 @@
# 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'agenda/$', views.agendas),
url(r'agenda/(?P<agenda_identifier>[\w-]+)/datetimes/$', views.datetimes, name='api-agenda-datetimes'),
@ -33,4 +33,4 @@ urlpatterns = patterns('',
url(r'booking/(?P<booking_pk>\w+)/$', views.booking),
url(r'booking/(?P<booking_pk>\w+)/cancel/$', views.cancel_booking),
url(r'booking/(?P<booking_pk>\w+)/accept/$', views.accept_booking),
)
]

6
chrono/manager/urls.py
View File

@ -14,11 +14,11 @@
# 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('chrono.views',
urlpatterns = [
url(r'^$', views.homepage, name='chrono-manager-homepage'),
url(r'^agendas/add/$', views.agenda_add,
name='chrono-manager-agenda-add'),
@ -55,4 +55,4 @@ urlpatterns = patterns('chrono.views',
name='chrono-manager-sample-events-csv'),
url(r'^menu.json$', views.menu_json),
)
]

8
chrono/urls.py
View File

@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from django.conf import settings
from django.conf.urls import patterns, include, url
from django.conf.urls import include, url
from django.conf.urls.static import static
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
@ -26,17 +26,17 @@ from .api.urls import urlpatterns as chrono_api_urls
from .manager.urls import urlpatterns as chrono_manager_urls
urlpatterns = patterns('',
urlpatterns = [
url(r'^$', homepage, name='home'),
url(r'^manage/', decorated_includes(manager_required,
include(chrono_manager_urls))),
url(r'^api/', include(chrono_api_urls)),
url(r'^logout/$', logout, name='auth_logout'),
url(r'^login/$', login, name='auth_login'),
)
]
if 'mellon' in settings.INSTALLED_APPS:
urlpatterns += patterns('', url(r'^accounts/mellon/', include('mellon.urls')))
urlpatterns.append(url(r'^accounts/mellon/', include('mellon.urls')))
# static and media files
urlpatterns += staticfiles_urlpatterns()