Bug 583622: email_in.pl doesn't let me set timetracking fields

r/a=mkanat

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 9d99822680f270e0c43f5d06d8123dae872227cd..81acdcd5a431cbfa62d21814e18b4138568f1938 100644 (file)
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3266,12 +3266,6 @@ sub map_fields {
         my $field_name = FIELD_MAP->{$field} || $field;
         $field_values{$field_name} = $params->{$field};
     }
-
-    # This protects the WebService Bug.search method.
-    unless (Bugzilla->user->is_timetracker) {
-        delete @field_values{qw(estimated_time remaining_time deadline)};
-    }
-    
     return \%field_values;
 }
 

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index a249de05d8f04b68bccea6d11e91a1a763013c1d..5c1be4a58ef28233bf2a3d7d13ac14251178e716 100644 (file)
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -388,7 +388,11 @@ sub search {
     
     $params = Bugzilla::Bug::map_fields($params);
     delete $params->{WHERE};
-    
+
+    unless (Bugzilla->user->is_timetracker) {
+        delete $params->{$_} foreach qw(estimated_time remaining_time deadline);
+    }
+
     # Do special search types for certain fields.
     if ( my $bug_when = delete $params->{delta_ts} ) {
         $params->{WHERE}->{'delta_ts >= ?'} = $bug_when;