From 2f5045ad5b20492db98f7666429053d2a9276266 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Fri, 10 Oct 2014 20:31:06 -0400
Subject: Revert "Bug 1074586 - New Feature: Bugs of Interest"

This reverts commit ccea670dcba24ff2ac0233437aa549b22edb390c.
---
 Bugzilla/Field.pm  |  2 --
 Bugzilla/Search.pm | 25 +++----------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index 86811d9bc..d5f8e33f9 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -270,8 +270,6 @@ use constant DEFAULT_FIELDS => (
     {name => 'tag',                   desc => 'Tags'},
     {name => 'last_visit_ts',         desc => 'Last Visit', buglist => 1,
      type => FIELD_TYPE_DATETIME},
-    {name => 'bug_interest_ts',       desc => 'Bug Interest', buglist => 1,
-     type => FIELD_TYPE_DATETIME},
     {name => 'comment_tag',           desc => 'Comment Tag'},
 );
 
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 7f27e96f8..86e6764ff 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -354,12 +354,9 @@ use constant OPERATOR_FIELD_OVERRIDE => {
     },
     last_visit_ts => {
         _non_changed => \&_last_visit_ts,
-        _default     => \&_invalid_operator,
-    },
-    bug_interest_ts => {
-        _non_changed => \&_bug_interest_ts,
-        _default     => \&_invalid_operator,
+        _default     => \&_last_visit_ts_invalid_operator,
     },
+    
     # Custom Fields
     FIELD_TYPE_FREETEXT, { _non_changed => \&_nullable },
     FIELD_TYPE_BUG_ID,   { _non_changed => \&_nullable_int },
@@ -390,7 +387,6 @@ sub SPECIAL_PARSING {
         # last_visit field that accept both a 1d, 1w, 1m, 1y format and the
         # %last_changed% pronoun.
         last_visit_ts => \&_last_visit_datetime,
-        bug_interest_ts => \&_last_visit_datetime,
 
         # BMO - Add ability to use pronoun for bug mentors field
         bug_mentor => \&_commenter_pronoun,
@@ -567,13 +563,6 @@ sub COLUMN_JOINS {
             from  => 'bug_id',
             to    => 'bug_id',
         },
-        bug_interest_ts => {
-            as    => 'bug_interest',
-            table => 'bug_interest',
-            extra => ['bug_interest.user_id = ' . $user->id],
-            from  => 'bug_id',
-            to    => 'bug_id',
-        },
     };
     return $joins;
 };
@@ -645,7 +634,6 @@ sub COLUMNS {
         
         'longdescs.count' => 'COUNT(DISTINCT map_longdescs_count.comment_id)',
         last_visit_ts => 'bug_user_last_visit.last_visit_ts',
-        bug_interest_ts => 'bug_interest.modification_time',
         assignee_last_login => 'assignee.last_seen_date',
     );
 
@@ -2800,14 +2788,7 @@ sub _last_visit_ts {
     $self->_add_extra_column('last_visit_ts');
 }
 
-sub _bug_interest_ts {
-    my ($self, $args) = @_;
-
-    $args->{full_field} = $self->COLUMNS->{bug_interest_ts}->{name};
-    $self->_add_extra_column('bug_interest_ts');
-}
-
-sub _invalid_operator {
+sub _last_visit_ts_invalid_operator {
     my ($self, $args) = @_;
 
     ThrowUserError('search_field_operator_invalid',
-- 
cgit v1.2.3-24-g4f1b