aboutsummaryrefslogtreecommitdiffstats
path: root/servo/urls
diff options
context:
space:
mode:
authorFilipp Lepalaan <filipp@mac.com>2015-10-13 22:43:45 +0300
committerFilipp Lepalaan <filipp@mac.com>2015-10-13 22:43:45 +0300
commite9b0f10c534c10b239301a58f8c00a4effe9adbf (patch)
tree0e5f1c844e204743b906e4c00c21fc5489b985c7 /servo/urls
parent5d5415d29daa990d27913da638a6e2bc30afb4e8 (diff)
downloadServo-e9b0f10c534c10b239301a58f8c00a4effe9adbf.tar.gz
Servo-e9b0f10c534c10b239301a58f8c00a4effe9adbf.tar.bz2
Servo-e9b0f10c534c10b239301a58f8c00a4effe9adbf.zip
AST 2fixes
Diffstat (limited to 'servo/urls')
-rw-r--r--servo/urls/device.py20
1 files changed, 15 insertions, 5 deletions
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<pk>\d+)/diags/$', 'diagnostics', name="devices-diagnostics"),
+ url(r'^(?P<pk>\d+)/diags/$', diagnostics, name="devices-diagnostics"),
+ url(r'^(?P<pk>\d+)/diags/select_test/$', select_test,
+ name="devices-select_test"),
+ url(r'^(?P<device>\d+)/diags/(?P<test_id>\d+)/run/$', run_test,
+ name="devices-run_test"),
- url(r'^(?P<pk>\d+)/update_gsx_details/$', "update_gsx_details", name="devices-update_gsx_details"),
+ url(r'^(?P<pk>\d+)/update_gsx_details/$', "update_gsx_details",
+ name="devices-update_gsx_details"),
url(r'^(?P<pk>\d+)/orders/(?P<order_id>\d+)/queue/(?P<queue_id>\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<device_id>\d+)/orders/create/$', create, name="devices-create_order"),
+ url(r'^(?P<device_id>\d+)/orders/create/$', create,
+ name="devices-create_order"),
url(r'^(?P<pk>\d+)/get_info/$', 'get_info', name="devices-get_info"),
url(r'^(?P<product_line>\w+)/$', "index", name="devices-list_devices"),
@@ -41,11 +49,13 @@ urlpatterns = patterns(
url(r'^(?P<product_line>\w+)/(?P<model>[\w\-]+)/(?P<pk>\d+)/$', "view_device",
name="devices-view_device"),
- url(r'^(?P<product_line>\w+)/(?P<model>[\w-]+)/(?P<pk>\d+)/edit/$', "edit_device",
+ url(r'^(?P<product_line>\w+)/(?P<model>[\w-]+)/(?P<pk>\d+)/edit/$',
+ "edit_device",
name="devices-edit_device"),
url(r'^(?P<product_line>\w+)/(?P<model>[\w-]+)/create/$', "edit_device",
name="devices-create_device"),
- url(r'^(?P<product_line>\w+)/(?P<model>[\w-]+)/(?P<pk>\d+)/delete/$', "delete_device",
+ url(r'^(?P<product_line>\w+)/(?P<model>[\w-]+)/(?P<pk>\d+)/delete/$',
+ "delete_device",
name="devices-delete_device"),
url(r'^search$', 'search', name="devices-search"),