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

[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  d4af30e0d0042b6ef4d0b7c8e80a9d5a152cb385 (commit)
       via  45e2e058634f2eeedf3d2fa6efa3d210073d5426 (commit)
      from  d7fd69d4502070a0cf4bbeae5b30f59b11c9995e (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 d4af30e0d0042b6ef4d0b7c8e80a9d5a152cb385
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Thu Feb 19 08:02:40 2015 -0500

    LP#1366026: Adding release notes entry for display active date
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/docs/RELEASE_NOTES_NEXT/Circulation/display_active_date.txt b/docs/RELEASE_NOTES_NEXT/Circulation/display_active_date.txt
new file mode 100644
index 0000000..5c3d604
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Circulation/display_active_date.txt
@@ -0,0 +1,7 @@
+Active date display in OPAC 
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+If a library uses the copy's active date to calculate holds age protection,
+the active date will display with the copy details instead of the create date
+in the staff client view of the catalog. Libraries that do not enable the 
+_Use Active Date for Age Protection_ library setting will continue to display
+the create date.

commit 45e2e058634f2eeedf3d2fa6efa3d210073d5426
Author: Jason Boyer <jboyer1 at library.in.gov>
Date:   Fri Sep 5 10:16:26 2014 -0400

    LP1366026: Add Active Date to Record Detail Page
    
    Display active date in place of create date when
    item circ_lib uses active date for hold age
    protection calculations.
    
    Signed-off-by: Jason Boyer <jboyer1 at library.in.gov>
    Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
    
    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/Application/AppUtils.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm
index 8de64a5..c8ae3c2 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm
@@ -1963,7 +1963,7 @@ sub basic_opac_copy_query {
 
     return {
         select => {
-            acp => ['id', 'barcode', 'circ_lib', 'create_date',
+            acp => ['id', 'barcode', 'circ_lib', 'create_date', 'active_date',
                     'age_protect', 'holdable', 'copy_number'],
             acpl => [
                 {column => 'name', alias => 'copy_location'},
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 033ac5b..74059d0 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -42,7 +42,7 @@ END;
             <th scope='col'>[% l("Shelving Location") %]</th>
             [%- IF ctx.is_staff %]
             <th scope='col'>[% l("Age Hold Protection") %]</th>
-            <th scope='col'>[% l("Create Date") %]</th>
+            <th scope='col'>[% l("Active/Create Date") %]</th>
             [%- END %]
             [%- IF ctx.is_staff OR serial_holdings %]
             <th scope='col'>[% l("Holdable?") %]</th>
@@ -141,8 +141,15 @@ END; # FOREACH bib
                 [% copy_info.age_protect ?
                     ctx.get_crahp(copy_info.age_protect).name : l('None') | html %]
             </td>
-            <td>[% date.format(
-                ctx.parse_datetime(copy_info.create_date),
+            <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;
+	    
+	    date.format(
+                ctx.parse_datetime(disp_date),
                 DATE_FORMAT
             ) %]</td>
             [% END # is_staff %]

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

Summary of changes:
 .../perlmods/lib/OpenILS/Application/AppUtils.pm   |    2 +-
 .../src/templates/opac/parts/record/copy_table.tt2 |   13 ++++++++++---
 .../Circulation/display_active_date.txt            |    7 +++++++
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/display_active_date.txt


hooks/post-receive
-- 
Evergreen ILS