[open-ils-commits] [GIT] Evergreen ILS branch master updated. fcaf1cc32c8568a8749eb38a219b061144145449

[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, master has been updated
       via  fcaf1cc32c8568a8749eb38a219b061144145449 (commit)
       via  55aaea83d127822b257bcb47876d7443a5ffd135 (commit)
      from  bb98f1885d0353cdde11e9e2631ecb553a7d685a (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 fcaf1cc32c8568a8749eb38a219b061144145449
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Thu Feb 19 15:59:33 2015 +0000

    LP#1418772: (follow-up) tweak undef-edness check
    
    Use the Perl defined() function rather than "eq undef"
    to avoid logging warnings about undefined values.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm
index 4ff0a1a..1e86db6 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm
@@ -196,7 +196,7 @@ sub init_ro_object_cache {
         my $date = shift;
 
         # Calling parse_datetime() with empty $date will lead to Internal Server Error
-        return '' if ($date eq '' or $date eq undef);
+        return '' if (!defined($date) or $date eq '');
 
         # Probably an accidental entry like '0212' instead of '2012',
         # but 1) the leading 0 may get stripped in cstore and

commit 55aaea83d127822b257bcb47876d7443a5ffd135
Author: Steven Chan <schan at sitka.bclibraries.ca>
Date:   Mon Jul 22 12:39:48 2013 -0700

    LP#1418772: Avoid internal server error on viewing full record when copy create_date is null
    
    In the TPAC client, when it tries to show record details containing a copy
    record with no create date, it shows an Internal Server Error instead.
    
    1. The error is caused by trying to execute the parse_datetime() method
    in the parse_date() function in the WWW/EGCatLoader/util.pm module with
    an empty date string. The function will normally translate a datetime
    string from the database to a datetime string that is formatted for TPAC
    templates.  The fix is to not execute parse_datetime() and just return
    an empty string.
    
    2. In the record/copy_table.tt2 template, if an empty datetime string is
    the value for copy_info.create_date, the format() method of the Date
    plugin will show the current datetime by default. The fix is to show '-'
    in its place, replicating the same template logic as for
    copy_info.due_date.
    
    Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
    
    Conflicts:
    	Open-ILS/src/templates/opac/parts/record/copy_table.tt2
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm
index 05f59d8..4ff0a1a 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm
@@ -195,6 +195,9 @@ sub init_ro_object_cache {
     $ro_object_subs->{parse_datetime} = sub {
         my $date = shift;
 
+        # Calling parse_datetime() with empty $date will lead to Internal Server Error
+        return '' if ($date eq '' or $date eq undef);
+
         # Probably an accidental entry like '0212' instead of '2012',
         # but 1) the leading 0 may get stripped in cstore and
         # 2) DateTime::Format::ISO8601 returns an error as years
diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index 74059d0..1c09536 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -142,16 +142,21 @@ END; # FOREACH bib
                     ctx.get_crahp(copy_info.age_protect).name : l('None') | html %]
             </td>
             <td>[% 
-            IF ctx.get_org_setting(copy_info.circ_lib, 'circ.holds.age_protect.active_date') == 1;
-              disp_date = copy_info.active_date ? copy_info.active_date : copy_info.create_date;
-            ELSE;
-              disp_date = copy_info.create_date;
-            END;
+                IF ctx.get_org_setting(copy_info.circ_lib, 'circ.holds.age_protect.active_date') == 1;
+                    disp_date = copy_info.active_date ? copy_info.active_date : copy_info.create_date;
+                ELSE;
+                    disp_date = copy_info.create_date;
+                END;
 	    
-	    date.format(
-                ctx.parse_datetime(disp_date),
-                DATE_FORMAT
-            ) %]</td>
+                IF disp_date;
+                    date.format(
+                        ctx.parse_datetime(disp_date),
+                        DATE_FORMAT
+                    );
+                ELSE;
+                   '-';
+                END;
+            %]</td>
             [% END # is_staff %]
             [% IF ctx.is_staff OR serial_holdings %]
             <td>[%  # Show copy/volume hold links to staff (without

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

Summary of changes:
 .../perlmods/lib/OpenILS/WWW/EGCatLoader/Util.pm   |    3 ++
 .../src/templates/opac/parts/record/copy_table.tt2 |   23 ++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Evergreen ILS