From: Frédéric Buclin <LpSolit@gmail.com>
Date: Mon, 2 Aug 2010 01:37:55 +0000 (+0200)
Subject: Bug 583622: email_in.pl doesn't let me set timetracking fields
X-Git-Tag: bugzilla-3.6.2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ef1df1f71d8c4bb81764444737ee843858dd013;p=thirdparty%2Fbugzilla.git

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 9d99822680..81acdcd5a4 100644
--- 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 a249de05d8..5c1be4a58e 100644
--- 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;