From 45b7728b22f637b3b6d95bc540be05045ee4facf Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Wed, 18 Sep 2013 15:53:04 +0800
Subject: Bug 917203: tracking flags with flag_type of "status" is unclear

---
 extensions/BMO/lib/Util.pm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'extensions/BMO/lib/Util.pm')

diff --git a/extensions/BMO/lib/Util.pm b/extensions/BMO/lib/Util.pm
index b25215f61..4da02081e 100644
--- a/extensions/BMO/lib/Util.pm
+++ b/extensions/BMO/lib/Util.pm
@@ -76,17 +76,19 @@ sub parse_date {
 
 sub is_active_status_field {
     my ($field) = @_;
-    if ($field->type != FIELD_TYPE_EXTENSION
-        && $field->name =~ /^cf_status/)
-    {
-        return !grep { $field->name eq $_ } @$cf_disabled_flags
-    }
 
     if ($field->type == FIELD_TYPE_EXTENSION
-        && $field->can('flag_type')
-        && $field->flag_type eq 'status')
-    {
-        return 1;
+        && $field->isa('Bugzilla::Extension::TrackingFlags::Flag')
+        && $field->flag_type eq 'tracking'
+        && $field->name =~ /_status_/
+    ) {
+        return $field->is_active;
+    }
+
+    if ($field->type != FIELD_TYPE_EXTENSION
+        && $field->name =~ /^cf_status/
+    ) {
+        return !grep { $field->name eq $_ } @$cf_disabled_flags
     }
 
     return 0;
-- 
cgit v1.2.3-24-g4f1b