From 45e2e058634f2eeedf3d2fa6efa3d210073d5426 Mon Sep 17 00:00:00 2001
From: Jason Boyer <jboyer1@library.in.gov>
Date: Fri, 5 Sep 2014 10:16:26 -0400
Subject: [PATCH] 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@library.in.gov>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>

Conflicts:
	Open-ILS/src/templates/opac/parts/record/copy_table.tt2

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 .../perlmods/lib/OpenILS/Application/AppUtils.pm    |  2 +-
 .../src/templates/opac/parts/record/copy_table.tt2  | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/AppUtils.pm
index 8de64a5467..c8ae3c21fc 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 033ac5bf3f..74059d03cf 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 %]
-- 
2.43.2