show some holds

diff --git a/Open-ILS/src/perlmods/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/OpenILS/WWW/EGCatLoader.pm
index e9682ca..e8f253d 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/WWW/EGCatLoader.pm
+++ b/Open-ILS/src/perlmods/OpenILS/WWW/EGCatLoader.pm
@@ -77,6 +77,9 @@ sub load {
     return $self->load_record if $path =~ /opac\/record/;
     return $self->load_place_hold if $path =~ /opac\/place_hold/;
 
+    # XXX here is where we need to add a check for session timeout, either that
+    # or have load_* check something...
+
     return $self->load_myopac_holds if $path =~ /opac\/myopac\/holds/;
     return $self->load_myopac_circs if $path =~ /opac\/myopac\/circs/;
     return $self->load_myopac if $path =~ /opac\/myopac/;
@@ -404,8 +407,6 @@ sub load_record {
 # context additions: 
 #   user : au object, fleshed
 sub load_myopac {
-    # XXX This crashes on session timeout, so somewhere around here we need to
-    # add handling for that
     my $self = shift;
     $self->ctx->{page} = 'myopac';
 

diff --git a/Open-ILS/web/templates/default/opac/myopac/holds.tt2 b/Open-ILS/web/templates/default/opac/myopac/holds.tt2
index 4f5aee8..86df64b 100644 (file)
--- a/Open-ILS/web/templates/default/opac/myopac/holds.tt2
+++ b/Open-ILS/web/templates/default/opac/myopac/holds.tt2
@@ -7,6 +7,8 @@
 </style>
 [% END %]
 
+[% USE date %]
+[% PROCESS "default/opac/common.tt2" %]
 [% WRAPPER "default/opac/base.tt2" %]
 [% INCLUDE "default/opac/myopac/_links.tt2" myopac_page = "holds" %]
 <table>
@@ -24,6 +26,24 @@
             <th>Edit</th>
         </tr>
     </thead>
+    <tbody>
+        [% FOR hold IN ctx.holds %]
+            [% attrs = {marc_xml => hold.marc_xml}; %]
+            [% PROCESS get_marc_attrs args=attrs; %]
+        <tr>
+            <td>[% attrs.title %]</td>
+            <td>[% attrs.author %]</td>
+            <td>[% hold.hold.hold.holdable_formats %]<!-- see _myOPACFleshHoldTitle(), search for "mods_formats" in skin/default/js/myopac.js; holdable_formats is wrong --></td>
+            <td>[% ctx.find_aou(hold.hold.hold.pickup_lib).name %]</td>
+            <td>[% hold.hold.hold.status %]<!-- see myOShowHoldStatus() in skin/default/js/myopac.js --></td>
+            <td></td>
+            <td></td>
+            <td>[% hold.hold.hold.expire_time %]</td>
+            <td><em>XXX TODO</em></td>
+            <td><em>XXX TODO</em></td>
+        </tr>
+        [% END %]
+    </tbody>
 </table>
 
 [% END %]