Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 342113: Allow custom fields to appear as a discrete field in the search form

Browse Source 
r=glob,a=glob


git-svn-id: svn://10.0.0.236/trunk@265887 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2015-03-19 09:00:50 +00:00
parent 4e8be14b27
commit 8574d46376
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
9342 9343

2
mozilla/webtools/bugzilla/.gitrev
View File

@ -1 +1 @@
0f01ca16e49a2b7b73778a11c4d03b5dd33b0099 42584a88aecb7430d6cef2c7b73779842ea5c80d

9
mozilla/webtools/bugzilla/query.cgi
View File

@ -208,6 +208,15 @@ $vars->{'priority'} = Bugzilla::Field->new({name => 'priority'})->legal_values;
$vars->{'bug_severity'} = Bugzilla::Field->new({name => 'bug_severity'})->legal_values; $vars->{'bug_severity'} = Bugzilla::Field->new({name => 'bug_severity'})->legal_values;
$vars->{'resolution'} = Bugzilla::Field->new({name => 'resolution'})->legal_values; $vars->{'resolution'} = Bugzilla::Field->new({name => 'resolution'})->legal_values;
# grab custom fields
my @custom_fields = Bugzilla->active_custom_fields;
$vars->{'custom_fields'} = \@custom_fields;
foreach my $cf (@custom_fields) {
if ($cf->type == FIELD_TYPE_SINGLE_SELECT || $cf->type == FIELD_TYPE_MULTI_SELECT) {
$vars->{$cf->name} = $cf->legal_values;
}
}
# Boolean charts # Boolean charts
my @fields = @{ Bugzilla->fields({ obsolete => 0 }) }; my @fields = @{ Bugzilla->fields({ obsolete => 0 }) };

13
mozilla/webtools/bugzilla/template/en/default/search/form.html.tmpl
View File

@ -127,6 +127,10 @@ TUI_hide_default('information_query');
{ field => bug_fields.keywords, accesskey => 'k', { field => bug_fields.keywords, accesskey => 'k',
qtypes => ['allwords', 'anywords', 'nowords', 'regexp', 'notregexp'] } qtypes => ['allwords', 'anywords', 'nowords', 'regexp', 'notregexp'] }
] %] ] %]
[% FOREACH field = custom_fields %]
[% freetext_fields.push({ field => field }) IF field.type == constants.FIELD_TYPE_FREETEXT or field.type == constants.FIELD_TYPE_TEXTAREA %]
[% END %]
[% Hook.process('before_freetext_fields') %] [% Hook.process('before_freetext_fields') %]
[%# loop through a bunch of free text fields and print out their text stuff %] [%# loop through a bunch of free text fields and print out their text stuff %]
@ -215,6 +219,15 @@ TUI_hide_default('information_query');
accesskey =>"o" accesskey =>"o"
value => default.op_sys value => default.op_sys
%] %]
[% FOREACH field = custom_fields %]
[% IF field.type == constants.FIELD_TYPE_SINGLE_SELECT or
field.type == constants.FIELD_TYPE_MULTI_SELECT %]
[% INCLUDE "search/field.html.tmpl"
field => field
value => default.${field.name}
%]
[% END %]
[% END %]
[% Hook.process('after_selects_bottom') %] [% Hook.process('after_selects_bottom') %]
</div> </div>
</div> </div>