LAVA Dashboard (deprecated)

Merge lp:~pfalcon/lava-dashboard/1217880 into lp:lava-dashboard

  1. 1217880
  2. Merge into trunk
Proposed by Paul Sokolovsky
Status: Merged
Merged at revision: 420
Proposed branch: lp:~pfalcon/lava-dashboard/1217880
Merge into: lp:lava-dashboard
Diff against target: 22 lines (+6/-6)
1 file modified
dashboard_app/urls.py (+6/-6)
To merge this branch: bzr merge lp:~pfalcon/lava-dashboard/1217880
Reviewer Review Type Date Requested Status
Antonio Terceiro Approve
Neil Williams Pending
Review via email: mp+184080@code.launchpad.net

Description of the change

Fixes lp:1217880. As hinted by mwhudson in the bug, it's just the matter of adjusting regexp. And I made it fully liberal - entire path component (anything between "/") is treated as a username.

To post a comment you must log in.
Revision history for this message
Antonio Terceiro (terceiro) wrote :

Looks good to me

 review approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dashboard_app/urls.py'
2--- dashboard_app/urls.py 2013-01-15 14:09:48 +0000
3+++ dashboard_app/urls.py 2013-09-05 11:35:20 +0000
4@@ -35,12 +35,12 @@
5 url(r'^filters/\+add-cases-for-test-json$', 'filters.views.filter_add_cases_for_test_json'),
6 url(r'^filters/\+attribute-name-completion-json$', 'filters.views.filter_attr_name_completion_json'),
7 url(r'^filters/\+attribute-value-completion-json$', 'filters.views.filter_attr_value_completion_json'),
8- url(r'^filters/~(?P<username>[a-zA-Z0-9-_]+)/(?P<name>[a-zA-Z0-9-_]+)$', 'filters.views.filter_detail'),
9- url(r'^filters/~(?P<username>[a-zA-Z0-9-_]+)/(?P<name>[a-zA-Z0-9-_]+)/json$', 'filters.views.filter_json'),
10- url(r'^filters/~(?P<username>[a-zA-Z0-9-_]+)/(?P<name>[a-zA-Z0-9-_]+)/\+edit$', 'filters.views.filter_edit'),
11- url(r'^filters/~(?P<username>[a-zA-Z0-9-_]+)/(?P<name>[a-zA-Z0-9-_]+)/\+subscribe$', 'filters.views.filter_subscribe'),
12- url(r'^filters/~(?P<username>[a-zA-Z0-9-_]+)/(?P<name>[a-zA-Z0-9-_]+)/\+delete$', 'filters.views.filter_delete'),
13- url(r'^filters/~(?P<username>[a-zA-Z0-9-_]+)/(?P<name>[a-zA-Z0-9-_]+)/\+compare/(?P<tag1>[a-zA-Z0-9-_: .]+)/(?P<tag2>[a-zA-Z0-9-_: .]+)$', 'filters.views.compare_matches'),
14+ url(r'^filters/~(?P<username>[^/]+)/(?P<name>[a-zA-Z0-9-_]+)$', 'filters.views.filter_detail'),
15+ url(r'^filters/~(?P<username>[^/]+)/(?P<name>[a-zA-Z0-9-_]+)/json$', 'filters.views.filter_json'),
16+ url(r'^filters/~(?P<username>[^/]+)/(?P<name>[a-zA-Z0-9-_]+)/\+edit$', 'filters.views.filter_edit'),
17+ url(r'^filters/~(?P<username>[^/]+)/(?P<name>[a-zA-Z0-9-_]+)/\+subscribe$', 'filters.views.filter_subscribe'),
18+ url(r'^filters/~(?P<username>[^/]+)/(?P<name>[a-zA-Z0-9-_]+)/\+delete$', 'filters.views.filter_delete'),
19+ url(r'^filters/~(?P<username>[^/]+)/(?P<name>[a-zA-Z0-9-_]+)/\+compare/(?P<tag1>[a-zA-Z0-9-_: .]+)/(?P<tag2>[a-zA-Z0-9-_: .]+)$', 'filters.views.compare_matches'),
20 url(r'^streams/$', 'bundle_stream_list'),
21 url(r'^streams/json$', 'bundle_stream_list_json'),
22 url(r'^streams(?P<pathname>/[a-zA-Z0-9/._-]+)bundles/$', 'bundle_list'),

Subscribers

People subscribed via source and target branches