diff options
| author | Ed Morley <emorley@mozilla.com> | 2014-09-29 23:32:12 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2014-09-29 23:32:12 +0200 |
| commit | 84b390d25f1427f7f10265f70e19157689c924c5 (patch) | |
| tree | 469ef2f0faa6c375a67f44817576fca4a348f41f | |
| parent | 3a970cb4c11ff46fcc6eb45d28ec4b62a4ed1bb4 (diff) | |
| download | bugzilla-84b390d25f1427f7f10265f70e19157689c924c5.tar.gz bugzilla-84b390d25f1427f7f10265f70e19157689c924c5.tar.xz | |
Bug 1072981 - User activity labels & params conflate "sort" and "group"
| -rw-r--r-- | extensions/BMO/lib/Reports/UserActivity.pm | 6 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/pages/user_activity.html.tmpl | 30 | ||||
| -rw-r--r-- | template/en/default/global/header.html.tmpl | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/extensions/BMO/lib/Reports/UserActivity.pm b/extensions/BMO/lib/Reports/UserActivity.pm index 77ba10b95..04810c2ec 100644 --- a/extensions/BMO/lib/Reports/UserActivity.pm +++ b/extensions/BMO/lib/Reports/UserActivity.pm @@ -100,7 +100,7 @@ sub report { push @params, ($from_dt, $to_dt); } - my $order = ($input->{'sort'} && $input->{'sort'} eq 'bug') + my $order = ($input->{'group'} && $input->{'group'} eq 'bug') ? 'bug_id, bug_when' : 'bug_when'; my $comment_filter = ''; @@ -257,7 +257,7 @@ sub report { $incomplete_data = 1; } - # Start a new changeset if required (depends on the sort order) + # Start a new changeset if required (depends on the grouping type) my $is_new_changeset; if ($order eq 'bug_when') { $is_new_changeset = @@ -321,7 +321,7 @@ sub report { $vars->{'who_count'} = scalar @who; $vars->{'from'} = $from; $vars->{'to'} = $to; - $vars->{'sort'} = $input->{'sort'}; + $vars->{'group'} = $input->{'group'}; } 1; diff --git a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl index ef2115bcb..c9b46b2eb 100644 --- a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl +++ b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl @@ -64,12 +64,12 @@ <div id="con_calendar_to"></div> </td> <th> - Sort: + Group by: </th> <td> - <select name="sort"> - <option value="when" [% 'selected' IF sort == 'when' %]>When</option> - <option value="bug" [% 'selected' IF sort == 'bug' %]>[% terms.Bug %]</option> + <select name="group"> + <option value="when" [% 'selected' IF group == 'when' %]>When</option> + <option value="bug" [% 'selected' IF group == 'bug' %]>[% terms.Bug %]</option> </select> </td> <td> @@ -111,12 +111,12 @@ [% IF who_count > 1 %] <th>Who</th> [% END %] - [% IF sort == 'when' %] - <th class="sorted">[% INCLUDE sort_when_link %]</th> - <th>[% INCLUDE sort_bug_link %]</th> + [% IF group == 'when' %] + <th class="sorted">[% INCLUDE group_when_link %]</th> + <th>[% INCLUDE group_bug_link %]</th> [% ELSE %] - <th class="sorted">[% INCLUDE sort_bug_link %]</th> - <th>[% INCLUDE sort_when_link %]</th> + <th class="sorted">[% INCLUDE group_bug_link %]</th> + <th>[% INCLUDE group_when_link %]</th> [% END %] <th>What</th> <th>Removed</th> @@ -131,7 +131,7 @@ [% IF who_count > 1 %] <td>[% operation.who FILTER email FILTER html %]</td> [% END %] - [% IF sort == 'when' %] + [% IF group == 'when' %] <td>[% change.when FILTER time FILTER no_break %]</td> <td>[% operation.bug FILTER bug_link(operation.bug) FILTER none %]</td> [% ELSE %] @@ -143,7 +143,7 @@ <td> </td> [% END %] <td> </td> - [% IF sort == 'when' %] + [% IF group == 'when' %] <td> </td> [% ELSE %] <td>[% change.when FILTER time FILTER no_break %]</td> @@ -213,18 +213,18 @@ [% INCLUDE global/footer.html.tmpl %] -[% BLOCK sort_when_link %] +[% BLOCK group_when_link %] <a href="page.cgi?id=user_activity.html&action=run& [%~%]who=[% who FILTER uri %]& [%~%]from=[% from FILTER uri %]& [%~%]to=[% to FILTER uri %]& - [%~%]sort=when">When</a> + [%~%]group=when">When</a> [% END %] -[% BLOCK sort_bug_link %] +[% BLOCK group_bug_link %] <a href="page.cgi?id=user_activity.html&action=run& [%~%]who=[% who FILTER uri %]& [%~%]from=[% from FILTER uri %]& [%~%]to=[% to FILTER uri %]& - [%~%]sort=bug">[% terms.Bug %]</a> + [%~%]group=bug">[% terms.Bug %]</a> [% END %] diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index 03947c5a1..a558d28ed 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -266,7 +266,7 @@ [% END %] <li><a href="page.cgi?id=mydashboard.html">My Dashboard</a></li> <li><a href="user_profile">My Profile</a></li> - <li><a href="page.cgi?id=user_activity.html&action=run&sort=when&who=[% user.login FILTER uri %]">My Activity</a></li> + <li><a href="page.cgi?id=user_activity.html&action=run&who=[% user.login FILTER uri %]">My Activity</a></li> <li><a href="request.cgi?requester=[% user.login FILTER uri %]&requestee=[% user.login FILTER uri %]&do_union=1&group=type&action=queue">My Requests</a></li> <li><a href="userprefs.cgi">Preferences</a></li> [% IF user.in_group('tweakparams') || user.in_group('editusers') || user.can_bless |