From ac56d17a475bcb56c10cfdc83529bf7eda0909fc Mon Sep 17 00:00:00 2001 From: Bouzid Fergani Date: Mon, 3 Oct 2016 15:02:04 -0400 Subject: [PATCH] Bug12532 - delete useless code and many change for preference EnableRedirectGuaranteeEmail messages affected: ODUE, HOLD, DUE, PREDUE, CHECKIN, CHECKOUT --- .../bug_12532-EnableRedirectGuaranteeEmail_syspref.sql | 2 +- installer/data/mysql/sysprefs.sql | 2 +- .../intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref | 8 ++++---- .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 9 --------- members/memberentry.pl | 4 ++-- 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_12532-EnableRedirectGuaranteeEmail_syspref.sql b/installer/data/mysql/atomicupdate/bug_12532-EnableRedirectGuaranteeEmail_syspref.sql index 2e08159..11fb97e 100644 --- a/installer/data/mysql/atomicupdate/bug_12532-EnableRedirectGuaranteeEmail_syspref.sql +++ b/installer/data/mysql/atomicupdate/bug_12532-EnableRedirectGuaranteeEmail_syspref.sql @@ -1,2 +1,2 @@ INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) -VALUES ('EnableRedirectGuaranteeEmail','0',NULL,'Enable the ability to redirect guarantee email messages to guarantor.','YesNo'); +VALUES ('RedirectGuaranteeEmail','0',NULL,'Enable the ability to redirect guarantee email messages to guarantor.','YesNo'); diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index ba65196..13c918c 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -137,7 +137,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('EnableAdvancedCatalogingEditor','0','','Enable the Rancor advanced cataloging editor','YesNo'), ('EnableBorrowerFiles','0',NULL,'If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo'), ('EnableOpacSearchHistory','1','YesNo','Enable or disable opac search history',''), -('EnableRedirectGuaranteeEmail', '0', NULL, 'Enable the ability to redirect guarantee email messages to guarantor.', 'YesNo'), +('RedirectGuaranteeEmail', '0', NULL, 'Enable the ability to redirect guarantee email messages to guarantor.', 'YesNo'), ('EnableSearchHistory','0','','Enable or disable search history','YesNo'), ('EnhancedMessagingPreferences','0','','If ON, allows patrons to select to receive additional messages about items due or nearly due.','YesNo'), ('EnhancedMessagingPreferencesOPAC', '1', NULL, 'If ON, show patrons messaging setting on the OPAC.', 'YesNo'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref index 4f596d0..9066424 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref @@ -187,11 +187,11 @@ Patrons: - track last patron activity. - Everytime a patron will connect, the borrowers.lastseen will be updated with the current time. - - - pref: EnableRedirectGuaranteeEmail + - pref: RedirectGuaranteeEmail choices: - yes: Do - no: "Don't" - - enable the ability to redirect guarantee email messages to guarantor. All email message placed in message_queue table will be affected. + yes: Enable + no: "Don't enable" + - redirection of guarantee email messages to the guarantor. All email messages send via the message_queue table will be affected. "Norwegian patron database": - - pref: NorwegianPatronDBEnable diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 083f936..113a2ec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -77,10 +77,6 @@ $(document).ready(function() { $("#entryform").submit(); } }); - $("#PatronMmessagingPreferences").click(function(){ - $("#entryform").submit(); - }); - }); var MSG_SEPARATOR = _("Separator must be / in field %s"); @@ -1062,11 +1058,6 @@ $(document).ready(function() { [% IF ( step_5 ) %][% IF ( EnhancedMessagingPreferences ) %]
Patron messaging preferences - [% IF ( !opadd ) && ( !opduplicate ) && !destination %] - - [% END %] [% IF ( opadd ) %]