Bugzilla – Attachment 55985 Details for
Bug 12532
Copy guarantee email to guarantor (or redirect if guarantee has no email set)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug12532 - delete useless code and many change for preference EnableRedirectGuaranteeEmail
Bug12532---delete-useless-code-and-many-change-for.patch (text/plain), 5.56 KB, created by
Bouzid Fergani
on 2016-10-03 19:07:59 UTC
(
hide
)
Description:
Bug12532 - delete useless code and many change for preference EnableRedirectGuaranteeEmail
Filename:
MIME Type:
Creator:
Bouzid Fergani
Created:
2016-10-03 19:07:59 UTC
Size:
5.56 KB
patch
obsolete
>From ac56d17a475bcb56c10cfdc83529bf7eda0909fc Mon Sep 17 00:00:00 2001 >From: Bouzid Fergani <bouzid.fergani@inlibro.com> >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 ) %] > <fieldset class="rows" id="memberentry_messaging_prefs"> > <legend id="patron_messaging_prefs_lgd">Patron messaging preferences</legend> >- [% IF ( !opadd ) && ( !opduplicate ) && !destination %] >- <script type="text/javascript"> >- $("#saverecord").attr("id","PatronMmessagingPreferences"); >- </script> >- [% END %] > [% IF ( opadd ) %] > <!-- handle changing prefs if creating new patron and changing > the patron category >diff --git a/members/memberentry.pl b/members/memberentry.pl >index 02db166..1b100b0 100755 >--- a/members/memberentry.pl >+++ b/members/memberentry.pl >@@ -333,8 +333,8 @@ if ($op eq 'save' || $op eq 'insert'){ > push @errors, "ERROR_login_exist"; > } > >- my $password = $input->param('password') || ''; >- my $password2 = $input->param('password2') || ''; >+ my $password = $input->param('password'); >+ my $password2 = $input->param('password2'); > push @errors, "ERROR_password_mismatch" if ( $password ne $password2 ); > push @errors, "ERROR_short_password" if( $password && $minpw && $password ne '****' && (length($password) < $minpw) ); > >-- >1.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12532
:
29510
|
30747
|
35313
|
36752
|
39787
|
39925
|
48645
|
53649
|
53689
|
53690
|
53699
|
53700
|
55985
|
56052
|
56053
|
59445
|
59446
|
59447
|
63197
|
64802
|
64824
|
67115
|
68340
|
70865
|
72064
|
72617
|
75099
|
77606
|
80313
|
85134
|
85135
|
87815
|
87816
|
88208
|
88209
|
88210
|
88211
|
88212
|
88213
|
88295
|
88296
|
114455
|
114456
|
114457
|
114458
|
114459
|
114460
|
114461
|
131091
|
131092
|
131093
|
131094
|
149233
|
150071
|
150208
|
150217
|
150240
|
150256
|
151028
|
151029
|
154854
|
154855
|
154856
|
154857
|
155036
|
155037
|
155828
|
155829
|
155830
|
155831
|
155832
|
155833
|
155834
|
155835
|
155836
|
155837
|
155873
|
155874
|
155875
|
155876
|
155877
|
155878
|
155879
|
155880
|
155881
|
155882
|
155883
|
155886
|
155934
|
155935
|
155936
|
155937
|
155938
|
155939
|
155940
|
155941
|
155942
|
155943
|
155944
|
155945
|
155946