[open-ils-commits] [GIT] Evergreen ILS branch rel_3_4 updated. e39a35e5ec7c1be4b16b0b36744f0bdf1778e517

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_3_4 has been updated
       via  e39a35e5ec7c1be4b16b0b36744f0bdf1778e517 (commit)
       via  ec7db5a9bcfddec860b48f5112abc79f63197468 (commit)
       via  d47ba05830155323028e935c1be3eee6a8f0d1a6 (commit)
      from  d4185338f2726761d479e77765038189c4867f2e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e39a35e5ec7c1be4b16b0b36744f0bdf1778e517
Author: Jason Boyer <JBoyer at equinoxinitiative.org>
Date:   Fri Jul 31 11:10:24 2020 -0400

    LP1842431: Remove redundant description field
    
    This branch brings about a good change, but I think having reason
    and description be identical in the case of a failure and blank /
    'SUCCESS' in the case of, well, success, is redundant and potentially
    confusing. Also, if it's not used in the default template I doubt
    anyone ever realizes it's there. :) Template editors can use
    is_renewed to decide if they want to display success as a result
    and that way the capitalization won't look like THE EIGHTIES have come
    back in fashion again. :D
    
    Signed-off-by: Jason Boyer <JBoyer at equinoxinitiative.org>
    Signed-off-by: Jason Stephenson <jason at sigio.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/Circ/AutoRenew.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/Circ/AutoRenew.pm
index 0fbc21dffd..a64d19cb6d 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/Circ/AutoRenew.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/Circ/AutoRenew.pm
@@ -74,7 +74,6 @@ sub handler {
             new_due_date => $is_renewed ? $evt->{payload}->{circ}->due_date : '',
             old_due_date => !$is_renewed ? $_->due_date() : '',
             textcode => $evt->{textcode},
-            description => $evt->{desc},
         );
 
         # Create the event from the source circ instead of the

commit ec7db5a9bcfddec860b48f5112abc79f63197468
Author: Jason Stephenson <jason at sigio.com>
Date:   Fri Sep 6 11:09:18 2019 -0400

    LP#1842431 Split textcode and desc fields for AutoRenew user data
    
    Split the event textcode and desc fields into textcode and description
    fields, respectively, in the AutoRenew reactor's user data, but also
    leave the reason field alone.  This permits sites to show only the
    description of the event if they want.
    
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
    Signed-off-by: Jason Boyer <JBoyer at equinoxinitiative.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/Circ/AutoRenew.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/Circ/AutoRenew.pm
index 6c6de46b4e..0fbc21dffd 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/Circ/AutoRenew.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/Circ/AutoRenew.pm
@@ -73,6 +73,8 @@ sub handler {
             reason => !$is_renewed ? $evt->{desc} : '',
             new_due_date => $is_renewed ? $evt->{payload}->{circ}->due_date : '',
             old_due_date => !$is_renewed ? $_->due_date() : '',
+            textcode => $evt->{textcode},
+            description => $evt->{desc},
         );
 
         # Create the event from the source circ instead of the

commit d47ba05830155323028e935c1be3eee6a8f0d1a6
Author: Michele Morgan <mmorgan at noblenet.org>
Date:   Thu Sep 12 16:30:47 2019 -0400

    LP#1842431 Make renewal failure reason more appropriate for patron notifications
    
    Changes the failure reason for the autorenewal to include only the desc,
    Removes the textcode of the event, which shouldn't be included in a patron notice.
    
    Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Jason Boyer <JBoyer at equinoxinitiative.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/Circ/AutoRenew.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/Circ/AutoRenew.pm
index 09dc0b18ae..6c6de46b4e 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/Circ/AutoRenew.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Reactor/Circ/AutoRenew.pm
@@ -70,7 +70,7 @@ sub handler {
         my %user_data = (
             copy => $_->target_copy(),
             is_renewed => $is_renewed,
-            reason => !$is_renewed ? sprintf("%s : %s", $evt->{textcode}, substr($evt->{desc}, 0, 140)) : '',
+            reason => !$is_renewed ? $evt->{desc} : '',
             new_due_date => $is_renewed ? $evt->{payload}->{circ}->due_date : '',
             old_due_date => !$is_renewed ? $_->due_date() : '',
         );

-----------------------------------------------------------------------

Summary of changes:
 .../perlmods/lib/OpenILS/Application/Trigger/Reactor/Circ/AutoRenew.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Evergreen ILS