diff options
| author | David Lawrence <dkl@mozilla.com> | 2015-10-14 17:53:48 +0200 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2015-10-14 17:53:56 +0200 |
| commit | 0e11b4a741c9104db967a2c51fa77b071cb087f5 (patch) | |
| tree | 27605728dab566604a46ef740e87d487dda79567 /extensions/BugModal | |
| parent | 9c792196e7f940dacda41424ed25a02bb4c0b633 (diff) | |
| download | bugzilla-0e11b4a741c9104db967a2c51fa77b071cb087f5.tar.gz bugzilla-0e11b4a741c9104db967a2c51fa77b071cb087f5.tar.xz | |
Bug 1195952 - Please add the following choices to the CAB review drop down area of bugzilla
Diffstat (limited to 'extensions/BugModal')
3 files changed, 16 insertions, 5 deletions
diff --git a/extensions/BugModal/lib/WebService.pm b/extensions/BugModal/lib/WebService.pm index e85225f60..7a05f263b 100644 --- a/extensions/BugModal/lib/WebService.pm +++ b/extensions/BugModal/lib/WebService.pm @@ -91,11 +91,12 @@ sub edit { Bugzilla->active_custom_fields({ product => $bug->product_obj, component => $bug->component_obj }); foreach my $field (@custom_fields) { my $field_name = $field->name; - $options{$field_name} = [ - map { { name => $_->name } } - grep { $bug->$field_name eq $_->name || $_->is_active } - @{ $field->legal_values } - ]; + my @values = map { { name => $_->name } } + grep { $bug->$field_name eq $_->name + || ($_->is_active + && $bug->check_can_change_field($field_name, $bug->$field_name, $_->name)) } + @{ $field->legal_values }; + $options{$field_name} = \@values; } # keywords diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl index eca6f5805..b8c86194c 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -736,6 +736,15 @@ %] [% END %] + [% UNLESS cf_hidden_in_product('cf_cab_review', bug.product, bug.component, bug) %] + [% rendered_custom_fields.push('cf_cab_review') %] + [% INCLUDE bug_modal/field.html.tmpl + field = bug_fields.cf_cab_review + field_type = bug_fields.cf_cab_review.type + hide_on_view = bug.cf_cab_review == "---" + %] + [% END %] + [% END %] [% WRAPPER fields_rhs %] diff --git a/extensions/BugModal/template/en/default/bug_modal/field.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/field.html.tmpl index 0c2f59cb0..bbc7dbb00 100644 --- a/extensions/BugModal/template/en/default/bug_modal/field.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/field.html.tmpl @@ -173,6 +173,7 @@ END; [% IF values.defined %] [% FOREACH v IN values %] [% NEXT IF NOT v.is_active AND NOT value.contains(v.name).size %] + [% NEXT IF NOT bug.check_can_change_field(name, bug.${name}, v.name) %] <option value="[% v.name FILTER html %]" id="v[% v.id FILTER html %]_[% name FILTER html %]" [% " selected" IF value.contains(v.name).size %] |