Bug 1162334: email_enabled value inverted in User.update RPC call

r=glob,a=glob

diff --git a/Bugzilla/API/1_0/Resource/User.pm b/Bugzilla/API/1_0/Resource/User.pm
index 8b4e99e2ecad7b5dbbdb4d63273887778f85a411..3f1b6272d51ab227813a08b81d5cba4002591b06 100644 (file)
--- a/Bugzilla/API/1_0/Resource/User.pm
+++ b/Bugzilla/API/1_0/Resource/User.pm
@@ -56,14 +56,12 @@ use constant MAPPED_FIELDS => {
     email => 'login',
     full_name => 'name',
     login_denied_text => 'disabledtext',
-    email_enabled => 'disable_mail'
 };
 
 use constant MAPPED_RETURNS => {
     login_name => 'email',
     realname => 'full_name',
     disabledtext => 'login_denied_text',
-    disable_mail => 'email_enabled'
 };
 
 sub REST_RESOURCES {

diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index fdc54de04edb04a64117f61bb2639451068d7a05..8df1316c53a060fd943e128a126faa59b06071a9 100644 (file)
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -314,8 +314,9 @@ sub _check_is_enabled {
 # Mutators
 ################################################################################
 
-sub set_disable_mail { $_[0]->set('disable_mail', $_[1]); }
-sub set_extern_id    { $_[0]->set('extern_id', $_[1]); }
+sub set_disable_mail  { $_[0]->set('disable_mail', $_[1]); }
+sub set_email_enabled { $_[0]->set('disable_mail', !$_[1]); }
+sub set_extern_id     { $_[0]->set('extern_id', $_[1]); }
 
 sub set_login {
     my ($self, $login) = @_;
@@ -3098,6 +3099,10 @@ C<hash> - This is the same as set_groups, but affects what groups a user
 has direct membership to bless that group. It takes the same inputs as
 set_groups.
 
+=item C<set_email_enabled>
+
+C<bool> - Sets C<disable_mail> to the inverse of the boolean provided.
+
 =back
 
 =head1 CLASS FUNCTIONS

diff --git a/Bugzilla/WebService/User.pm b/Bugzilla/WebService/User.pm
index 06698668cb07f470825a76b19b45f5989256e057..0ae76d70fe456142ebca06ab33b7c6d41171bdc3 100644 (file)
--- a/Bugzilla/WebService/User.pm
+++ b/Bugzilla/WebService/User.pm
@@ -46,14 +46,12 @@ use constant MAPPED_FIELDS => {
     email => 'login',
     full_name => 'name',
     login_denied_text => 'disabledtext',
-    email_enabled => 'disable_mail'
 };
 
 use constant MAPPED_RETURNS => {
     login_name => 'email',
     realname => 'full_name',
     disabledtext => 'login_denied_text',
-    disable_mail => 'email_enabled'
 };
 
 ##############