From 0e11b4a741c9104db967a2c51fa77b071cb087f5 Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Wed, 14 Oct 2015 15:53:48 +0000
Subject: Bug 1195952 - Please add the following choices to the CAB review drop
 down area of bugzilla

---
 extensions/BugModal/lib/WebService.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'extensions/BugModal/lib')

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
-- 
cgit v1.2.3-24-g4f1b