diff options
| -rw-r--r-- | Bugzilla/Hook.pm | 15 | ||||
| -rwxr-xr-x | colchange.cgi | 83 | ||||
| -rw-r--r-- | template/en/default/list/change-columns.html.tmpl | 33 |
3 files changed, 62 insertions, 69 deletions
diff --git a/Bugzilla/Hook.pm b/Bugzilla/Hook.pm index ffb6a6e7b..a5be1d38d 100644 --- a/Bugzilla/Hook.pm +++ b/Bugzilla/Hook.pm @@ -428,21 +428,6 @@ spaces. =back -=head2 colchange_columns - -This happens in F<colchange.cgi> right after the list of possible display -columns have been defined and gives you the opportunity to add additional -display columns to the list of selectable columns. - -Params: - -=over - -=item C<columns> - An arrayref containing an array of column IDs. Any IDs -added by this hook must have been defined in the the L</buglist_columns> hook. - -=back - =head2 config_add_panels If you want to add new panels to the Parameters administrative interface, diff --git a/colchange.cgi b/colchange.cgi index 15bdac599..a8429e2ed 100755 --- a/colchange.cgi +++ b/colchange.cgi @@ -24,7 +24,6 @@ # Pascal Held <paheld@gmail.com> use strict; - use lib qw(. lib); use Bugzilla; @@ -34,7 +33,24 @@ use Bugzilla::CGI; use Bugzilla::Search::Saved; use Bugzilla::Error; use Bugzilla::User; -use Bugzilla::Keyword; + +use Storable qw(dclone); + +# Maps parameters that control columns to the names of columns. +use constant COLUMN_PARAMS => { + 'useclassification' => ['classification'], + 'usebugaliases' => ['alias'], + 'usetargetmilestone' => ['target_milestone'], + 'useqacontact' => ['qa_contact', 'qa_contact_realname'], + 'usestatuswhiteboard' => ['status_whiteboard'], +}; + +# We only show these columns if an object of this type exists in the +# database. +use constant COLUMN_CLASSES => { + 'Bugzilla::Flag' => 'flagtypes.name', + 'Bugzilla::Keyword' => 'keywords', +}; Bugzilla->login(); @@ -42,52 +58,31 @@ my $cgi = Bugzilla->cgi; my $template = Bugzilla->template; my $vars = {}; -# The master list not only says what fields are possible, but what order -# they get displayed in. -my @masterlist = ("opendate", "changeddate", "bug_severity", "priority", - "rep_platform", "assigned_to", "assigned_to_realname", - "reporter", "reporter_realname", "bug_status", - "resolution"); +my $columns = dclone(Bugzilla::Search::COLUMNS); -if (Bugzilla->params->{"useclassification"}) { - push(@masterlist, "classification"); -} +# You can't manually select "relevance" as a column you want to see. +delete $columns->{'relevance'}; -push(@masterlist, ("product", "component", "version", "op_sys")); - -if (Bugzilla->params->{"usebugaliases"}) { - unshift(@masterlist, "alias"); -} -if (Bugzilla->params->{"usetargetmilestone"}) { - push(@masterlist, "target_milestone"); -} -if (Bugzilla->params->{"useqacontact"}) { - push(@masterlist, "qa_contact"); - push(@masterlist, "qa_contact_realname"); -} -if (Bugzilla->params->{"usestatuswhiteboard"}) { - push(@masterlist, "status_whiteboard"); -} -if (Bugzilla::Keyword->any_exist) { - push(@masterlist, "keywords"); -} -if (Bugzilla->has_flags) { - push(@masterlist, "flagtypes.name"); -} -if (Bugzilla->user->is_timetracker) { - push(@masterlist, ("estimated_time", "remaining_time", "actual_time", - "percentage_complete", "deadline")); +foreach my $param (keys %{ COLUMN_PARAMS() }) { + next if Bugzilla->params->{$param}; + foreach my $column (@{ COLUMN_PARAMS->{$param} }) { + delete $columns->{$column}; + } } -push(@masterlist, ("short_desc", "short_short_desc")); - -my @custom_fields = grep { $_->type != FIELD_TYPE_MULTI_SELECT } - Bugzilla->active_custom_fields; -push(@masterlist, map { $_->name } @custom_fields); +foreach my $class (keys %{ COLUMN_CLASSES() }) { + eval("use $class; 1;") || die $@; + my $column = COLUMN_CLASSES->{$class}; + delete $columns->{$column} if !$class->any_exist; +} -Bugzilla::Hook::process('colchange_columns', {'columns' => \@masterlist} ); +if (!Bugzilla->user->is_timetracker) { + foreach my $column (TIMETRACKING_FIELDS) { + delete $columns->{$column}; + } +} -$vars->{'masterlist'} = \@masterlist; +$vars->{'columns'} = $columns; my @collist; if (defined $cgi->param('rememberedquery')) { @@ -96,8 +91,8 @@ if (defined $cgi->param('rememberedquery')) { @collist = DEFAULT_COLUMN_LIST; } else { if (defined $cgi->param("selected_columns")) { - my %legal_list = map { $_ => 1 } @masterlist; - @collist = grep { exists $legal_list{$_} } $cgi->param("selected_columns"); + @collist = grep { exists $columns->{$_} } + $cgi->param("selected_columns"); } if (defined $cgi->param('splitheader')) { $splitheader = $cgi->param('splitheader')? 1: 0; diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl index 36cd5dbb8..77deb503c 100644 --- a/template/en/default/list/change-columns.html.tmpl +++ b/template/en/default/list/change-columns.html.tmpl @@ -34,10 +34,22 @@ [% PROCESS "global/field-descs.none.tmpl" %] [% field_descs.short_short_desc = "Summary (first 60 characters)" %] -[% field_descs.short_desc = "Full Summary" %] -[% field_descs.assigned_to_realname = "Assignee Realname" %] -[% field_descs.reporter_realname = "Reporter Realname" %] -[% field_descs.qa_contact_realname = "QA Contact Realname" %] +[% field_descs.short_desc = "Summary (Full)" %] +[% field_descs.assigned_to_realname = "$field_descs.assigned_to Real Name" %] +[% field_descs.reporter_realname = "$field_descs.reporter Real Name" %] +[% field_descs.qa_contact_realname = "$field_descs.qa_contact Real Name" %] + +[%# Create a mapping of field descriptions to field names, so that + # the "Available Columns" list can be sorted alphabetically by + # field description. + #%] +[% SET available_columns = {} %] +[% FOREACH column = columns.keys %] + [% NEXT IF collist.contains(column) %] + [%# We lowecase the keys so that the sort happens case-insensitively. %] + [% SET column_desc = field_descs.$column || column FILTER lower %] + [% available_columns.$column_desc = column %] +[% END %] <form name="changecolumns" action="colchange.cgi" onsubmit="change_submit();"> <input type="hidden" name="rememberedquery" value="[% buffer FILTER html %]"> @@ -70,12 +82,13 @@ [% (field_descs.${column} || column) FILTER html %] </option> [% END %] - [% FOREACH column = masterlist %] - [% IF lsearch(collist, column) == -1 %] - <option value="[% column FILTER html %]"> - [% (field_descs.${column} || column) FILTER html %] - </option> - [% END %] + [% FOREACH key = available_columns.keys.sort %] + [% SET column = available_columns.$key %] + <option value="[% column FILTER html %]"> + [%# Don't display the lower-cased column description, + # display the correct-case one. %] + [% (field_descs.$column || column) FILTER html %] + </option> [% END %] </select> </td> |