LP1797934: Fixing timezones and removing test code

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Remington Steed <rjs7@calvin.edu>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
index e559695..3ec7900 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
@@ -996,8 +996,6 @@ sub load_myopac_holds {
     my $e = $self->editor;
     my $ctx = $self->ctx;
 
-$ctx->{cats} = "Dogs";
-
     my $limit = $self->cgi->param('limit') || 15;
     my $offset = $self->cgi->param('offset') || 0;
     my $action = $self->cgi->param('action') || '';
@@ -2898,7 +2896,6 @@ sub load_myopac_reservations {
     );
 
     $ctx->{reservations} = $upcoming;
-    $ctx->{dogs} = "BEAST";
     return Apache2::Const::OK;
 
 }

diff --git a/Open-ILS/src/templates/opac/myopac/reservations.tt2 b/Open-ILS/src/templates/opac/myopac/reservations.tt2
index 50d5c0f..d134246 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/reservations.tt2
+++ b/Open-ILS/src/templates/opac/myopac/reservations.tt2
@@ -16,8 +16,8 @@
     [% FOREACH r IN ctx.reservations %]
         <tr>
             <td>[% r.resource_type_name %]</td>
-            <td>[% date.format(ctx.parse_datetime(r.start_time, 1), DATE_FORMAT _ ' %I:%M %p') %]</td>
-            <td>[% date.format(ctx.parse_datetime(r.end_time, 1), DATE_FORMAT _ ' %I:%M %p') %]</td>
+            <td>[% date.format(ctx.parse_datetime(r.start_time, r.pickup_lib), DATE_FORMAT _ ' %I:%M %p') %]</td>
+            <td>[% date.format(ctx.parse_datetime(r.end_time, r.pickup_lib), DATE_FORMAT _ ' %I:%M %p') %]</td>
             <td><a href="../library/[% r.shortname %]">[% r.pickup_name %]</a></td>
             <td>
             [% IF r.cancel_time %]