1 files changed, 22 insertions, 12 deletions

diff --git a/Bugzilla/WebService/Product.pm b/Bugzilla/WebService/Product.pm
index 3cd0d0a6c..525339cda 100644
--- a/Bugzilla/WebService/Product.pm
+++ b/Bugzilla/WebService/Product.pm
@@ -47,23 +47,28 @@ BEGIN { *get_products = \&get }
 
 # Get the ids of the products the user can search
 sub get_selectable_products {
+    Bugzilla->switch_to_shadow_db();
     return {ids => [map {$_->id} @{Bugzilla->user->get_selectable_products}]}; 
 }
 
 # Get the ids of the products the user can enter bugs against
 sub get_enterable_products {
+    Bugzilla->switch_to_shadow_db();
     return {ids => [map {$_->id} @{Bugzilla->user->get_enterable_products}]}; 
 }
 
 # Get the union of the products the user can search and enter bugs against.
 sub get_accessible_products {
+    Bugzilla->switch_to_shadow_db();
     return {ids => [map {$_->id} @{Bugzilla->user->get_accessible_products}]}; 
 }
 
 # Get a list of actual products, based on list of ids or names
 sub get {
     my ($self, $params) = validate(@_, 'ids', 'names');
-    
+
+    Bugzilla->switch_to_shadow_db();
+
     # Only products that are in the users accessible products, 
     # can be allowed to be returned
     my $accessible_products = Bugzilla->user->get_accessible_products;
@@ -148,40 +153,41 @@ sub _product_to_hash {
     }
     if (filter_wants($params, 'versions')) {
         $field_data->{versions} = [map {
-            $self->_version_to_hash($_)
+            $self->_version_to_hash($_, $params)
         } @{$product->versions}];
     }
     if (filter_wants($params, 'milestones')) {
         $field_data->{milestones} = [map {
-            $self->_milestone_to_hash($_)
+            $self->_milestone_to_hash($_, $params)
         } @{$product->milestones}];
     }
     return filter($params, $field_data);
 }
 
 sub _component_to_hash {
-    my ($self, $component) = @_;
-    return {
+    my ($self, $component, $params) = @_;
+    my $field_data = {
         id =>
             $self->type('int', $component->id),
         name =>
             $self->type('string', $component->name),
         description =>
-            $self->type('string' , $component->description),
+            $self->type('string', $component->description),
         default_assigned_to =>
-            $self->type('string' , $component->default_assignee->login),
+            $self->type('email', $component->default_assignee->login),
         default_qa_contact =>
-            $self->type('string' , $component->default_qa_contact->login),
+            $self->type('email', $component->default_qa_contact->login),
         sort_key =>  # sort_key is returned to match Bug.fields
             0,
         is_active =>
             $self->type('boolean', $component->is_active),
     };
+    return filter($params, $field_data, 'components');
 }
 
 sub _version_to_hash {
-    my ($self, $version) = @_;
-    return {
+    my ($self, $version, $params) = @_;
+    my $field_data = {
         id =>
             $self->type('int', $version->id),
         name =>
@@ -191,11 +197,12 @@ sub _version_to_hash {
         is_active =>
             $self->type('boolean', $version->is_active),
     };
+    return filter($params, $field_data, 'versions');
 }
 
 sub _milestone_to_hash {
-    my ($self, $milestone) = @_;
-    return {
+    my ($self, $milestone, $params) = @_;
+    my $field_data = {
         id =>
             $self->type('int', $milestone->id),
         name =>
@@ -205,6 +212,7 @@ sub _milestone_to_hash {
         is_active =>
             $self->type('boolean', $milestone->is_active),
     };
+    return filter($params, $field_data, 'milestones');
 }
 
 1;
@@ -310,6 +318,8 @@ In addition to the parameters below, this method also accepts the
 standard L<include_fields|Bugzilla::WebService/include_fields> and
 L<exclude_fields|Bugzilla::WebService/exclude_fields> arguments.
 
+This RPC call supports sub field restrictions.
+
 =over
 
 =item C<ids>