@@ -, +, @@ --- C4/UsageStats.pm | 2 +- Koha/Patron.pm | 2 +- installer/data/mysql/mandatory/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/patrons.pref | 2 +- opac/opac-registration-verify.pl | 2 +- t/Auth_with_shibboleth.t | 2 +- t/db_dependent/Koha/Patrons.t | 10 +++++----- 7 files changed, 11 insertions(+), 11 deletions(-) --- a/C4/UsageStats.pm +++ a/C4/UsageStats.pm @@ -326,7 +326,7 @@ sub _shared_preferences { PatronSelfRegistration OPACShelfBrowser AutoEmailNewUser - AutoEmailPrimaryAddress + EmailFieldPrimary autoMemberNum BorrowerRenewalPeriodBase EnableBorrowerFiles --- a/Koha/Patron.pm +++ a/Koha/Patron.pm @@ -1400,7 +1400,7 @@ Returns the empty string if no email address. sub notice_email_address{ my ( $self ) = @_; - my $which_address = C4::Context->preference("AutoEmailPrimaryAddress"); + my $which_address = C4::Context->preference("EmailFieldPrimary"); # if syspref is set to 'first valid' (value == OFF), look up email address if ( $which_address eq 'OFF' ) { return $self->first_valid_email_address; --- a/installer/data/mysql/mandatory/sysprefs.sql +++ a/installer/data/mysql/mandatory/sysprefs.sql @@ -209,9 +209,9 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('ElasticsearchIndexStatus_biblios', '0', 'Biblios index status', NULL, NULL), ('ElasticsearchMARCFormat', 'ISO2709', 'ISO2709|ARRAY', 'Elasticsearch MARC format. ISO2709 format is recommended as it is faster and takes less space, whereas array is searchable.', 'Choice'), ('ElasticsearchCrossFields', '1', '', 'Enable "cross_fields" option for searches using Elastic search.', 'YesNo'), -('EmailFieldPrimary','OFF','email|emailpro|B_email|cardnumber|OFF','Defines the default email address field where patron email notices are sent.','Choice'), ('EmailAddressForPatronRegistrations', '', '', ' If you choose EmailAddressForPatronRegistrations you have to enter a valid email address: ', 'free'), ('EmailAddressForSuggestions','','',' If you choose EmailAddressForSuggestions you have to enter a valid email address: ','free'), +('EmailFieldPrimary','OFF','email|emailpro|B_email|cardnumber|OFF','Defines the default email address field where patron email notices are sent.','Choice'), ('emailLibrarianWhenHoldIsPlaced','0',NULL,'If ON, emails the librarian whenever a hold is placed','YesNo'), ('EmailOverduesNoEmail','1',NULL,'Send send overdues of patrons without email address to staff','YesNo'), ('EmailPatronRegistrations', '0', '0|EmailAddressForPatronRegistrations|BranchEmailAddress|KohaAdminEmailAddress', 'Choose email address that new patron registrations will be sent to: ', 'Choice'), --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref @@ -174,7 +174,7 @@ Patrons: - email receipts to patrons for payments and writeoffs. - - "Use" - - pref: AutoEmailPrimaryAddress + - pref: EmailFieldPrimary default: "OFF" choices: email: home --- a/opac/opac-registration-verify.pl +++ a/opac/opac-registration-verify.pl @@ -95,7 +95,7 @@ if ( # If 'AutoEmailNewUser' syspref is on, email user their account details from the 'notice' that matches the user's branchcode. if ( C4::Context->preference("AutoEmailNewUser") ) { - # Look up correct email address taking AutoEmailPrimaryAddress into account + # Look up correct email address taking EmailFieldPrimary into account my $emailaddr = $patron->notice_email_address; # if we manage to find a valid email address, send notice if ($emailaddr) { --- a/t/Auth_with_shibboleth.t +++ a/t/Auth_with_shibboleth.t @@ -419,7 +419,7 @@ sub mockedPref { $return = $staffClientBaseURL; } - if ( $param eq 'AutoEmailPrimaryAddress' ) { + if ( $param eq 'EmailFieldPrimary' ) { $return = 'OFF'; } --- a/t/db_dependent/Koha/Patrons.t +++ a/t/db_dependent/Koha/Patrons.t @@ -1066,11 +1066,11 @@ subtest 'notice_email_address' => sub { my $patron = $builder->build_object({ class => 'Koha::Patrons' }); - t::lib::Mocks::mock_preference( 'AutoEmailPrimaryAddress', 'OFF' ); - is ($patron->notice_email_address, $patron->email, "Koha::Patron->notice_email_address returns correct value when AutoEmailPrimaryAddress is off"); + t::lib::Mocks::mock_preference( 'EmailFieldPrimary', 'OFF' ); + is ($patron->notice_email_address, $patron->email, "Koha::Patron->notice_email_address returns correct value when EmailFieldPrimary is off"); - t::lib::Mocks::mock_preference( 'AutoEmailPrimaryAddress', 'emailpro' ); - is ($patron->notice_email_address, $patron->emailpro, "Koha::Patron->notice_email_address returns correct value when AutoEmailPrimaryAddress is emailpro"); + t::lib::Mocks::mock_preference( 'EmailFieldPrimary', 'emailpro' ); + is ($patron->notice_email_address, $patron->emailpro, "Koha::Patron->notice_email_address returns correct value when EmailFieldPrimary is emailpro"); $patron->delete; }; @@ -2176,7 +2176,7 @@ subtest 'queue_notice' => sub { plan tests => 11; my $dbh = C4::Context->dbh; - t::lib::Mocks::mock_preference( 'AutoEmailPrimaryAddress', 'email' ); + t::lib::Mocks::mock_preference( 'EmailFieldPrimary', 'email' ); my $patron = $builder->build_object( { class => 'Koha::Patrons' } ); my $branch = $builder->build_object( { class => 'Koha::Libraries' } ); my $letter_e = $builder->build_object( { --