aboutsummaryrefslogtreecommitdiffstats
path: root/servo/urls
diff options
context:
space:
mode:
authorFilipp Lepalaan <filipp@mac.com>2016-05-01 23:54:58 +0300
committerFilipp Lepalaan <filipp@mac.com>2016-05-01 23:54:58 +0300
commit47cc21441b437fe148c72bd181059728b47bdf9b (patch)
treecd96c0a704cb31837c6e0b2e9affe998d24acd7b /servo/urls
parent65df597329bbb602dd382695c639aab3776123ea (diff)
parent82e1fe63447f5c4d33d8a3ed7c365e7eab1006c0 (diff)
downloadServo-47cc21441b437fe148c72bd181059728b47bdf9b.tar.gz
Servo-47cc21441b437fe148c72bd181059728b47bdf9b.tar.bz2
Servo-47cc21441b437fe148c72bd181059728b47bdf9b.zip
Merge branch 'develop'
Diffstat (limited to 'servo/urls')
-rw-r--r--servo/urls/note.py2
-rw-r--r--servo/urls/stats.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/servo/urls/note.py b/servo/urls/note.py
index 98bf1bb..e68bba3 100644
--- a/servo/urls/note.py
+++ b/servo/urls/note.py
@@ -19,7 +19,7 @@ urlpatterns = [
name="notes-create_to_customer"),
url(r'^(?P<pk>\d+)/toggle/tag/(?P<tag_id>\d+)/$', toggle_tag,
name="notes-toggle_tag"),
- url(r'^(?P<pk>\d+)/toggle/(?P<flag>[a-z]+)/$', toggle_flag,
+ url(r'^(?P<kind>\w+)?/(?P<pk>\d+)/toggle_(?P<flag>[a-z]+)/$', toggle_flag,
name="notes-toggle_flag"),
url(r'^(?P<parent>\d+)/reply/$', edit, name="notes-reply"),
url(r'^(?P<pk>\d+)/edit/$', edit, name="notes-edit"),
diff --git a/servo/urls/stats.py b/servo/urls/stats.py
index d475e54..58c5ee3 100644
--- a/servo/urls/stats.py
+++ b/servo/urls/stats.py
@@ -13,4 +13,5 @@ urlpatterns = [
url(r'^statuses/$', statuses, name="stats-statuses"),
url(r'^data/(?P<query>[\w/\-]+)/$', data, name="stats-data"),
url(r'^repairs/$', repairs, name="stats-repairs"),
+ url(r'^devices/$', devices, name="stats-devices"),
]