Commit 3d2b7248 authored by Jeff Fearn's avatar Jeff Fearn Committed by Byron Jones

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

r=glob,a=glob
parent e191f86a
...@@ -213,7 +213,7 @@ use constant LOCAL_FILE => 'bugzilla-update.xml'; # Relative to datadir. ...@@ -213,7 +213,7 @@ use constant LOCAL_FILE => 'bugzilla-update.xml'; # Relative to datadir.
# When true CSS and JavaScript assets will be concatanted and minified at # When true CSS and JavaScript assets will be concatanted and minified at
# run-time, to reduce the number of requests required to render a page. # run-time, to reduce the number of requests required to render a page.
# Setting this to a false value can help debugging. # Setting this to a false value can help debugging.
use constant CONCATENATE_ASSETS => 0; use constant CONCATENATE_ASSETS => 1;
# These are unique values that are unlikely to match a string or a number, # These are unique values that are unlikely to match a string or a number,
# to be used in criteria for match() functions and other things. They start # to be used in criteria for match() functions and other things. They start
......
...@@ -314,8 +314,9 @@ sub _check_is_enabled { ...@@ -314,8 +314,9 @@ sub _check_is_enabled {
# Mutators # Mutators
################################################################################ ################################################################################
sub set_disable_mail { $_[0]->set('disable_mail', $_[1]); } sub set_disable_mail { $_[0]->set('disable_mail', $_[1]); }
sub set_extern_id { $_[0]->set('extern_id', $_[1]); } sub set_email_enabled { $_[0]->set('disable_mail', !$_[1]); }
sub set_extern_id { $_[0]->set('extern_id', $_[1]); }
sub set_login { sub set_login {
my ($self, $login) = @_; my ($self, $login) = @_;
...@@ -2679,6 +2680,10 @@ This notes that this account has failed to log in, and stores the fact ...@@ -2679,6 +2680,10 @@ This notes that this account has failed to log in, and stores the fact
in the database. The storing happens immediately, it does not wait for in the database. The storing happens immediately, it does not wait for
you to call C<update>. you to call C<update>.
=item C<set_email_enabled>
C<bool> - Sets C<disable_mail> to the inverse of the boolean provided.
=back =back
=head2 Other Methods =head2 Other Methods
......
...@@ -46,14 +46,12 @@ use constant MAPPED_FIELDS => { ...@@ -46,14 +46,12 @@ use constant MAPPED_FIELDS => {
email => 'login', email => 'login',
full_name => 'name', full_name => 'name',
login_denied_text => 'disabledtext', login_denied_text => 'disabledtext',
email_enabled => 'disable_mail'
}; };
use constant MAPPED_RETURNS => { use constant MAPPED_RETURNS => {
login_name => 'email', login_name => 'email',
realname => 'full_name', realname => 'full_name',
disabledtext => 'login_denied_text', disabledtext => 'login_denied_text',
disable_mail => 'email_enabled'
}; };
############## ##############
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment