Bug 750742: Create new BMO extension called TrackingFlags to move current tracking flags away from custom fields

4 files changed, 35 insertions, 15 deletions

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 15272e542..d974d8aa0 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -80,7 +80,8 @@ use constant AUDIT_UPDATES => 0;
 # This is a sub because it needs to call other subroutines.
 sub DB_COLUMNS {
     my $dbh = Bugzilla->dbh;
-    my @custom = grep {$_->type != FIELD_TYPE_MULTI_SELECT}
+    my @custom = grep {$_->type != FIELD_TYPE_MULTI_SELECT
+                       && $_->type != FIELD_TYPE_EXTENSION}
                       Bugzilla->active_custom_fields;
     my @custom_names = map {$_->name} @custom;
 
@@ -114,9 +115,9 @@ sub DB_COLUMNS {
     $dbh->sql_date_format('creation_ts', '%Y.%m.%d %H:%i') . ' AS creation_ts',
     $dbh->sql_date_format('deadline', '%Y-%m-%d') . ' AS deadline',
     @custom_names);
-    
+
     Bugzilla::Hook::process("bug_columns", { columns => \@columns });
-    
+
     return @columns;
 }
 
@@ -214,7 +215,8 @@ sub VALIDATOR_DEPENDENCIES {
 };
 
 sub UPDATE_COLUMNS {
-    my @custom = grep {$_->type != FIELD_TYPE_MULTI_SELECT}
+    my @custom = grep {$_->type != FIELD_TYPE_MULTI_SELECT
+                       && $_->type != FIELD_TYPE_EXTENSION}
                       Bugzilla->active_custom_fields;
     my @custom_names = map {$_->name} @custom;
     my @columns = qw(
@@ -2334,7 +2336,8 @@ sub set_all {
     $self->_add_remove($params, 'see_also');
 
     # And set custom fields.
-    my @custom_fields = Bugzilla->active_custom_fields;
+    my @custom_fields = grep { $_->type != FIELD_TYPE_EXTENSION }
+                             Bugzilla->active_custom_fields;
     foreach my $field (@custom_fields) {
         my $fname = $field->name;
         if (exists $params->{$fname}) {
@@ -3830,6 +3833,9 @@ sub editable_bug_fields {
         # Ensure field exists before attempting to remove it.
         splice(@fields, $location, 1) if ($location > -1);
     }
+
+    Bugzilla::Hook::process('bug_editable_bug_fields', { fields => \@fields });
+
     # Sorted because the old @::log_columns variable, which this replaces,
     # was sorted.
     return sort(@fields);
@@ -4344,6 +4350,7 @@ sub _create_cf_accessors {
 
     my $fields = Bugzilla->fields({ custom => 1 });
     foreach my $field (@$fields) {
+        next if $field->type == FIELD_TYPE_EXTENSION;
         my $accessor = $class->_accessor_for($field);
         my $name = "${class}::" . $field->name;
         {
@@ -4353,6 +4360,8 @@ sub _create_cf_accessors {
         }
     }
 
+    Bugzilla::Hook::process('bug_create_cf_accessors');
+
     Bugzilla->request_cache->{"${class}_cf_accessors_created"} = 1;
 }
 
diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index b5d3aab61..1f712f25d 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -129,6 +129,8 @@ use Memoize;
     FIELD_TYPE_BUG_ID
     FIELD_TYPE_BUG_URLS
     FIELD_TYPE_KEYWORDS
+    FIELD_TYPE_EXTENSION
+
     FIELD_TYPE_HIGHEST_PLUS_ONE
     
     EMPTY_DATETIME_REGEX
@@ -397,7 +399,8 @@ use constant SENDMAIL_PATH => '/usr/lib:/usr/sbin:/usr/ucblib';
 # only storage but also logic.  For example, we might add a "user" field type
 # whose values are stored in an integer column in the database but for which
 # we do more than we would do for a standard integer type (f.e. we might
-# display a user picker).
+# display a user picker). Fields of type FIELD_TYPE_EXTENSION should generally
+# be ignored by the core code and is used primary by extensions.
 
 use constant FIELD_TYPE_UNKNOWN   => 0;
 use constant FIELD_TYPE_FREETEXT  => 1;
@@ -409,9 +412,11 @@ use constant FIELD_TYPE_BUG_ID  => 6;
 use constant FIELD_TYPE_BUG_URLS => 7;
 use constant FIELD_TYPE_KEYWORDS => 8;
 use constant FIELD_TYPE_DATE => 9;
+use constant FIELD_TYPE_EXTENSION => 99;
+
 # Add new field types above this line, and change the below value in the
 # obvious fashion
-use constant FIELD_TYPE_HIGHEST_PLUS_ONE => 10;
+use constant FIELD_TYPE_HIGHEST_PLUS_ONE => 100;
 
 use constant EMPTY_DATETIME_REGEX => qr/^[0\-:\sA-Za-z]+$/; 
 
diff --git a/Bugzilla/Object.pm b/Bugzilla/Object.pm
index 96651d191..34134a69f 100644
--- a/Bugzilla/Object.pm
+++ b/Bugzilla/Object.pm
@@ -61,6 +61,9 @@ sub new {
     my $class    = ref($invocant) || $invocant;
     my $object   = $class->_init(@_);
     bless($object, $class) if $object;
+
+    Bugzilla::Hook::process('object_end_of_new', { object => $object });
+
     return $object;
 }
 
diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index 48eaff8d1..c3c11b728 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -384,15 +384,18 @@ sub _handle_field_names {
 
     # Flag and requestee shortcut
     if ($or_operand =~ /^(?:flag:)?([^\?]+\?)([^\?]*)$/) {
-        my ($flagtype, $requestee) = ($1, $2);
-        addChart('flagtypes.name', 'substring', $flagtype, $negate);
-        if ($requestee) {
-            # AND
-            $chart++;
-            $and = $or = 0;
-            addChart('requestees.login_name', 'substring', $requestee, $negate);
+        # BMO: Do not treat custom fields as flags if value is ?
+        if ($1 !~ /^cf_/) {
+            my ($flagtype, $requestee) = ($1, $2);
+            addChart('flagtypes.name', 'substring', $flagtype, $negate);
+            if ($requestee) {
+                # AND
+                $chart++;
+                $and = $or = 0;
+                addChart('requestees.login_name', 'substring', $requestee, $negate);
+            }
+            return 1;
         }
-        return 1;
     }
 
     # Generic field1,field2,field3:value1,value2 notation.