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

[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  3cee27e41f8c90ba63086bc29cab9fa01cb6bb7a (commit)
      from  80d5c4a4c7e81a7b5739befdd5a621a70d42d5f0 (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 3cee27e41f8c90ba63086bc29cab9fa01cb6bb7a
Author: Bill Erickson <berick at esilibrary.com>
Date:   Thu Oct 20 10:37:39 2011 -0400

    Tpac; repair format icon display in holds lists
    
    * Fetch MARC XML from unapi to pick up metabib::record_attr's for each
    record.
    
    * Update format icon code in holds list to use new-style precompiled
    format_icon
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
index 3265ae3..8a0674a 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -3049,7 +3049,8 @@ sub uber_hold_impl {
     my $details = retrieve_hold_queue_status_impl($e, $hold);
 
     my $resp = {
-        hold           => $hold,
+        hold    => $hold,
+        bre_id  => $bre->id,
         ($copy     ? (copy           => $copy)     : ()),
         ($volume   ? (volume         => $volume)   : ()),
         ($issuance ? (issuance       => $issuance) : ()),
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 59bc862..fe0da83 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
@@ -368,8 +368,7 @@ sub fetch_user_holds {
         suppress_notices => 1,
         suppress_transits => 1,
         suppress_mvr => 1,
-        suppress_patron_details => 1,
-        include_bre => $flesh ? 1 : 0
+        suppress_patron_details => 1
     };
 
     # ----------------------------------------------------------------
@@ -405,7 +404,10 @@ sub fetch_user_holds {
                 @collected = grep { $_->{hold}->{status} == 4 } @collected;
             }
             while(my $blob = pop(@collected)) {
-                $blob->{marc_xml} = XML::LibXML->new->parse_string($blob->{hold}->{bre}->marc) if $flesh;
+                my (undef, @data) = $self->get_records_and_facets(
+                    [$blob->{hold}->{bre_id}], undef, {flesh => '{mra}'}
+                );
+                $blob->{marc_xml} = $data[0]->{marc_xml};
                 push(@holds, $blob);
             }
         }
diff --git a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
index d57fd63..314741d 100644
--- a/Open-ILS/src/templates/opac/myopac/hold_history.tt2
+++ b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
@@ -73,11 +73,8 @@
                     <td width="64">
                         <div style="width:26px;height:23px;margin-top:6px;margin-bottom:6px;">
                             [% IF attrs.format_icon %]
-                            <img src="[% ctx.media_prefix %]/images/[% attrs.form_icon %]"
-                                title="[% attrs.format %]" alt="[% attrs.format %]" />
-                            [% ELSE;
-                                attrs.format;
-                               END %]
+                            <img title="[% attrs.format_label | html %]" alt="[% attrs.format_label | html %]" src="[% attrs.format_icon %]" />
+                            [% END %]
                         </div>
                     </td>
                     <td width="136">
diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2
index f008fb7..3c43ab2 100644
--- a/Open-ILS/src/templates/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds.tt2
@@ -146,11 +146,8 @@
                     <td width="64">
                         <div style="width:26px;height:23px;margin-top:6px;margin-bottom:6px;">
                             [% IF attrs.format_icon %]
-                            <img src="[% ctx.media_prefix %]/images/[% attrs.form_icon %]"
-                                title="[% attrs.format %]" alt="[% attrs.format %]" />
-                            [% ELSE;
-                                attrs.format;
-                               END %]
+                            <img title="[% attrs.format_label | html %]" alt="[% attrs.format_label | html %]" src="[% attrs.format_icon %]" />
+                            [% END %]
                         </div>
                     </td>
                     <td width="136">

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

Summary of changes:
 .../perlmods/lib/OpenILS/Application/Circ/Holds.pm |    3 ++-
 .../lib/OpenILS/WWW/EGCatLoader/Account.pm         |    8 +++++---
 .../src/templates/opac/myopac/hold_history.tt2     |    7 ++-----
 Open-ILS/src/templates/opac/myopac/holds.tt2       |    7 ++-----
 4 files changed, 11 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Evergreen ILS