Merge lp:~brian-murray/errors/user-packages into lp:errors

Proposed by Brian Murray
Status: Merged
Merged at revision: 351
Proposed branch: lp:~brian-murray/errors/user-packages
Merge into: lp:errors
Diff against target: 73 lines (+12/-3)
2 files modified
errors/static/js/most_common_problems.js (+8/-1)
errors/templates/main.html (+4/-2)
To merge this branch: bzr merge lp:~brian-murray/errors/user-packages
Reviewer Review Type Date Requested Status
Evan (community) Approve
Review via email: mp+154250@code.launchpad.net

Description of the change

This sets the filter for 'packages subscribed to by' to the logged in user if there is one. I've also added an event for package_selection on enter so that one can switch back to no filter by choosing 'all binary packages' and pressing enter.

I wanted this reviewed and tested as request.user.username was always returning openiduser for me.

To post a comment you must log in.
Revision history for this message
Evan (ev) wrote :

This looks good, save the superfluous space next to 'var loggedin_user'. It correctly sets the box to ~ev for me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'errors/static/js/most_common_problems.js'
2--- errors/static/js/most_common_problems.js 2013-03-12 14:53:12 +0000
3+++ errors/static/js/most_common_problems.js 2013-03-20 03:37:22 +0000
4@@ -1,7 +1,7 @@
5 var current_from_value;
6 var current_to_value;
7
8-function most_common_problems_table() {
9+function most_common_problems_table(loggedin_user) {
10 YUI().use('node', 'io-queue', 'io-form', 'datatable', 'datatable-sort',
11 'datasource-get', 'datasource-jsonschema', 'datatable-datasource',
12 'datatable-message', 'datatype', 'event-key', 'event-valuechange',
13@@ -336,10 +336,13 @@
14 Y.one('#package_name').setStyle('display', 'none');
15 return;
16 } else {
17+ Y.one('#package').set('value', '');
18+ Y.one('#user').set('value', '');
19 Y.one('#package_name').setStyle('visibility', 'hidden');
20 Y.one('#package_name').setStyle('display', 'none');
21 Y.one('#subscriber_name').setStyle('visibility', 'hidden');
22 Y.one('#subscriber_name').setStyle('display', 'none');
23+ return;
24 }
25 }
26 });
27@@ -389,6 +392,7 @@
28 }
29 }
30
31+ Y.one('#package_selection').on('key', interval_changed, 'enter');
32 Y.one('#package').on('key', package_changed, 'enter');
33 Y.one('#package').on('blur', package_changed, 'enter');
34 Y.one('#user').on('key', interval_changed, 'enter');
35@@ -428,6 +432,9 @@
36 Y.one('#package').set('value', query_string.package);
37 package_changed(false, expected_version);
38 }
39+ if (loggedin_user !== '') {
40+ query_string.user = loggedin_user;
41+ }
42 if (query_string.user !== undefined) {
43 update = true;
44 Y.one('#package_selection').get("options").each(function() {
45
46=== modified file 'errors/templates/main.html'
47--- errors/templates/main.html 2013-03-12 17:58:43 +0000
48+++ errors/templates/main.html 2013-03-20 03:37:22 +0000
49@@ -19,12 +19,14 @@
50 <script type="text/javascript" src="/static/js/most_common_problems.js"></script>
51
52 <script type="text/javascript">
53- {% if user.is_authenticated %}
54+ {% if request.user.is_authenticated %}
55 /* This is just a guide to the view. Do not /ever/ use this as an
56 * authentication check. */
57 var user_is_authenticated = true;
58+ var loggedin_user = '{{ request.user.username }}';
59 {% else %}
60 var user_is_authenticated = false;
61+ var loggedin_user = '';
62 {% endif %}
63
64 var means = {
65@@ -44,7 +46,7 @@
66 Y.one('#notes').setStyle('display', 'block');
67 }
68 mean_time_between_failures_graph(means);
69- most_common_problems_table();
70+ most_common_problems_table(loggedin_user);
71 });
72 });
73 </script>

Subscribers

People subscribed via source and target branches

to all changes: