From e9b0f10c534c10b239301a58f8c00a4effe9adbf Mon Sep 17 00:00:00 2001 From: Filipp Lepalaan Date: Tue, 13 Oct 2015 22:43:45 +0300 Subject: AST 2fixes --- servo/urls/device.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'servo/urls/device.py') diff --git a/servo/urls/device.py b/servo/urls/device.py index 132ffbf..defef62 100644 --- a/servo/urls/device.py +++ b/servo/urls/device.py @@ -5,6 +5,8 @@ from django.views.decorators.cache import cache_page from servo.views.order import create from servo.views.device import get_gsx_search_results +from servo.views.diagnostics import diagnostics, select_test, run_test + urlpatterns = patterns( "servo.views.device", @@ -14,9 +16,14 @@ urlpatterns = patterns( url(r'^find/$', "find", name="devices-find"), url(r'^add/$', "edit_device", name="devices-add"), - url(r'^(?P\d+)/diags/$', 'diagnostics', name="devices-diagnostics"), + url(r'^(?P\d+)/diags/$', diagnostics, name="devices-diagnostics"), + url(r'^(?P\d+)/diags/select_test/$', select_test, + name="devices-select_test"), + url(r'^(?P\d+)/diags/(?P\d+)/run/$', run_test, + name="devices-run_test"), - url(r'^(?P\d+)/update_gsx_details/$', "update_gsx_details", name="devices-update_gsx_details"), + url(r'^(?P\d+)/update_gsx_details/$', "update_gsx_details", + name="devices-update_gsx_details"), url(r'^(?P\d+)/orders/(?P\d+)/queue/(?P\d+)/parts/$', "parts", name="devices-parts"), @@ -30,7 +37,8 @@ urlpatterns = patterns( url(r'^choose/order/(\d+)/$', 'choose', name="devices-choose"), url(r'^upload/$', 'upload_devices', name="devices-upload_devices"), - url(r'^(?P\d+)/orders/create/$', create, name="devices-create_order"), + url(r'^(?P\d+)/orders/create/$', create, + name="devices-create_order"), url(r'^(?P\d+)/get_info/$', 'get_info', name="devices-get_info"), url(r'^(?P\w+)/$', "index", name="devices-list_devices"), @@ -41,11 +49,13 @@ urlpatterns = patterns( url(r'^(?P\w+)/(?P[\w\-]+)/(?P\d+)/$', "view_device", name="devices-view_device"), - url(r'^(?P\w+)/(?P[\w-]+)/(?P\d+)/edit/$', "edit_device", + url(r'^(?P\w+)/(?P[\w-]+)/(?P\d+)/edit/$', + "edit_device", name="devices-edit_device"), url(r'^(?P\w+)/(?P[\w-]+)/create/$', "edit_device", name="devices-create_device"), - url(r'^(?P\w+)/(?P[\w-]+)/(?P\d+)/delete/$', "delete_device", + url(r'^(?P\w+)/(?P[\w-]+)/(?P\d+)/delete/$', + "delete_device", name="devices-delete_device"), url(r'^search$', 'search', name="devices-search"), -- cgit v1.2.3