From: senator <lebbeous@esilibrary.com>
Date: Mon, 14 Feb 2011 15:39:54 +0000 (-0500)
Subject: hold placement works better
X-Git-Tag: opac-tt-poc-demo2~27^2~19^2
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=141fb8994fde8af1a1904bfc5219f7291d81c079;p=evergreen%2Fequinox.git

hold placement works better
---

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
index f303af7941..203b5a08dd 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
@@ -675,16 +675,17 @@ sub load_place_hold {
             );
 
             if($stat and $stat > 0) {
-
                 # if successful, return the user to the requesting page
                 $self->apache->log->info("Redirecting back to " . $cgi->param('redirect_to'));
                 $self->apache->print($cgi->redirect(-url => $cgi->param('redirect_to')));
                 return Apache2::Const::REDIRECT;
 
             } else {
-
-                $ctx->{hold_failed} = 1; # XXX process the events, etc
+                $ctx->{hold_failed} = 1;
             }
+        } else { # hold *check* failed
+            $ctx->{hold_failed} = 1; # XXX process the events, etc
+            $ctx->{hold_failed_event} = $allowed->{last_event};
         }
 
         # hold permit failed
diff --git a/Open-ILS/web/templates/default/opac-poc/place_hold.tt2 b/Open-ILS/web/templates/default/opac-poc/place_hold.tt2
index 91996ad3c0..bfbee071a3 100644
--- a/Open-ILS/web/templates/default/opac-poc/place_hold.tt2
+++ b/Open-ILS/web/templates/default/opac-poc/place_hold.tt2
@@ -23,9 +23,9 @@
     <form action='place_hold' method='POST'>
         Choose a pickup Library [% PROCESS build_org_selector name='pickup_lib' value=ctx.default_pickup_lib %]
         <input type='Submit'/>
-        <input type='hidden' name='hold_target' value='[% CGI.param('hold_target') %]'/>
-        <input type='hidden' name='hold_type' value='[% CGI.param('hold_type') %]'/>
-        <input type='hidden' name='redirect_to' value='[% ctx.referer %]'/>
+        <input type='hidden' name='hold_target' value='[% CGI.param('hold_target') | html %]'/>
+        <input type='hidden' name='hold_type' value='[% CGI.param('hold_type') | html %]'/>
+        <input type='hidden' name='redirect_to' value='[% ctx.referer | html %]'/>
     </form>
     [% END %]
 </div>
diff --git a/Open-ILS/web/templates/default/opac/parts/place_hold.tt2 b/Open-ILS/web/templates/default/opac/parts/place_hold.tt2
index b91d3b7817..7c99ec0277 100644
--- a/Open-ILS/web/templates/default/opac/parts/place_hold.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/place_hold.tt2
@@ -38,6 +38,21 @@
         <b>[% l("Checking for possibility of hold fulfillment...") %]</b>
     </div>
     <div id='holds_box' class='canvas' style='margin-top: 6px;'>
+        [% IF ctx.hold_success %]
+        <div><big><strong>[% l("Hold was successfully placed"); %]</strong></big></div>
+        [% ELSIF ctx.hold_failed %]
+        <div><big><strong>[% l("Hold was not successfully placed"); %]</strong></big></div>
+            [% IF ctx.hold_failed_event %]
+        <div>
+            <strong>Problem:</strong>
+            <span title="[% ctx.hold_failed_event.textcode %]">
+                <em>[% ctx.hold_failed_event.desc ||
+                        ctx.hold_failed_event.payload.fail_part ||
+                        ctx.hold_failed_event.textcode %]</em>
+            </span>
+        </div>
+            [% END;
+        ELSE %]
         <form method="POST">
             <br/>
             <input type="hidden" name="hold_target"
@@ -80,6 +95,7 @@
         </p>
         <p>* For best possible service, we recommend keeping a printed copy of
         your most recent holds list.</p>
+        [% END # ctx.hold_success %]
         <table width='90%' border="1" class="hide_me">
             <tbody>
                 <tr>