Bug 848217: The product component search field is not putting bugzilla.mozilla.org components before upstream Bugzilla components

1 files changed, 3 insertions, 70 deletions

diff --git a/extensions/MyDashboard/lib/WebService.pm b/extensions/MyDashboard/lib/WebService.pm
index e9ea2315f..1f3b7ce06 100644
--- a/extensions/MyDashboard/lib/WebService.pm
+++ b/extensions/MyDashboard/lib/WebService.pm
@@ -19,77 +19,10 @@ use Bugzilla::WebService::Util qw(validate);
 use Bugzilla::Extension::MyDashboard::Queries qw(QUERY_DEFS query_bugs query_flags);
 
 use constant READ_ONLY => qw(
-    prod_comp_search
     run_bug_query
     run_flag_query
 );
 
-sub prod_comp_search {
-    my ($self, $params) = @_;
-    my $user = Bugzilla->user;
-    my $dbh = Bugzilla->switch_to_shadow_db();
-
-    my $search = $params->{'search'};
-    $search || ThrowCodeError('param_required',
-        { function => 'Bug.prod_comp_search', param => 'search' });
-
-    my $limit = detaint_natural($params->{'limit'}) 
-                ? $dbh->sql_limit($params->{'limit'}) 
-                : '';
-
-    # We do this in the DB directly as we want it to be fast and
-    # not have the overhead of loading full product objects
-
-    # All products which the user has "Entry" access to.
-    my $enterable_ids = $dbh->selectcol_arrayref(
-           'SELECT products.id FROM products
-         LEFT JOIN group_control_map
-                   ON group_control_map.product_id = products.id
-                      AND group_control_map.entry != 0
-                      AND group_id NOT IN (' . $user->groups_as_string . ')
-            WHERE group_id IS NULL
-                  AND products.isactive = 1');
-
-    if (scalar @$enterable_ids) {
-        # And all of these products must have at least one component
-        # and one version.
-        $enterable_ids = $dbh->selectcol_arrayref(
-            'SELECT DISTINCT products.id FROM products
-              WHERE ' . $dbh->sql_in('products.id', $enterable_ids) .
-              ' AND products.id IN (SELECT DISTINCT components.product_id
-                                      FROM components
-                                     WHERE components.isactive = 1)
-                AND products.id IN (SELECT DISTINCT versions.product_id
-                                      FROM versions
-                                     WHERE versions.isactive = 1)');
-    }
-
-    return { products => [] } if !scalar @$enterable_ids;
-
-    my @list;
-    foreach my $word (split(/[\s,]+/, $search)) {
-        if ($word ne "") {
-            my $sql_word = $dbh->quote($word);
-            trick_taint($sql_word);
-            # XXX CONCAT_WS is MySQL specific
-            my $field = "CONCAT_WS(' ', products.name, components.name, components.description)";
-            push(@list, $dbh->sql_iposition($sql_word, $field) . " > 0");
-        }
-    }
-
-    my $products = $dbh->selectall_arrayref("
-        SELECT products.name AS product,
-               components.name AS component
-          FROM products 
-               INNER JOIN components ON products.id = components.product_id
-         WHERE (" . join(" AND ", @list) . ")
-               AND products.id IN (" . join(",", @$enterable_ids) . ")
-      ORDER BY products.name $limit", 
-        { Slice => {} });
-
-    return { products => $products };
-}
-
 sub run_bug_query {
     my($self, $params) = @_;
     my $dbh = Bugzilla->dbh;
@@ -104,7 +37,7 @@ sub run_bug_query {
     foreach my $qdef (QUERY_DEFS) {
         next if $qdef->{name} ne $params->{query};
         my ($bugs, $query_string) = query_bugs($qdef);
-        
+
         # Add last changes to each bug
         foreach my $b (@$bugs) {
             my $last_changes = {};
@@ -115,7 +48,7 @@ sub run_bug_query {
                 $last_changes->{activity} = $change_set->{changes};
                 foreach my $change (@{ $last_changes->{activity} }) {
                     $change->{field_desc}
-                        = template_var('field_descs')->{$change->{field_name}} || $change->{field_name};   
+                        = template_var('field_descs')->{$change->{field_name}} || $change->{field_name};
                 }
                 $last_changes->{email} = $change_set->{who};
                 $last_changes->{when} = $self->datetime_format_inbound($change_set->{when});
@@ -134,7 +67,7 @@ sub run_bug_query {
             }
             $b->{last_changes} = $last_changes;
         }
-        
+
         $query_string =~ s/^POSTDATA=&//;
         $qdef->{bugs}   = $bugs;
         $qdef->{buffer} = $query_string;