Return specially treated fields in "Bug Changes"

hinted-selects
Vitaliy Filippov 2014-10-07 14:57:42 +04:00
parent d7f1105e1f
commit 6574c7af78
2 changed files with 11 additions and 6 deletions

View File

@ -799,13 +799,19 @@ sub REPORT_COLUMNS
# This is now used only by query.cgi
sub CHANGEDFROMTO_FIELDS
{
# creation_ts, longdesc, longdescs.isprivate, commenter
# are treated specially and always have has_activity
# (see install_update_fielddefs CustIS hook)
my @fields = grep { $_->{name} } Bugzilla->get_fields({ has_activity => 1 });
# creation_ts, longdesc, longdescs.isprivate, commenter are treated specially
my @fields = map { {
id => $_->{name},
name => $_->{description},
} } Bugzilla->get_fields({ has_activity => 1 });
@fields = grep { $_->{id} ne 'creation_ts' && $_->{id} ne 'longdesc' } @fields;
push @fields, map { {
id => $_,
name => Bugzilla->messages->{field_descs}->{$_},
} } ('creation_ts', 'longdesc', 'commenter', Bugzilla->user->is_insider ? 'longdescs.isprivate' : ());
if (!Bugzilla->user->is_timetracker)
{
@fields = grep { !TIMETRACKING_FIELDS->{$_->name} } @fields;
@fields = grep { !TIMETRACKING_FIELDS->{$_->{id}} } @fields;
}
return \@fields;
}

View File

@ -173,7 +173,6 @@ if (!@{$default->{chfieldto}} || $default->{chfieldto}->[0] eq '')
# "where one or more of the following changed:"
$vars->{chfield} = [
sort { $a->{name} cmp $b->{name} }
map { { id => $_->{name}, name => $_->{description} } }
@{ Bugzilla::Search->CHANGEDFROMTO_FIELDS }
];