[open-ils-commits] [GIT] Evergreen ILS branch rel_2_9 updated. 3f2b5047fd02b7c691f32927f94db54c59d403c0

[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, rel_2_9 has been updated
       via  3f2b5047fd02b7c691f32927f94db54c59d403c0 (commit)
       via  e84f1af9274df0c02bbf9c48ee78842726d69fb5 (commit)
      from  0c76ab2eaac7793d6ce846c2fc8b4877b4b563a0 (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 3f2b5047fd02b7c691f32927f94db54c59d403c0
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Mar 14 15:06:12 2016 -0400

    LP#1548869: tidy up whitespace
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
index cdd73a5..7f944c7 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
@@ -36,12 +36,12 @@ sub load {
     # ----------------------------------------------------------------
     return $self->redirect_ssl unless $self->cgi->https;
 
-	#logic added to resolve path-matching conflict
-	if ($path =~ m|kpac/getit_results|) {
-	    return $self->load_getit_results;
-	} elsif ($path =~ m|kpac/getit|) {
-	    return $self->load_getit;
-	}
+    #logic added to resolve path-matching conflict
+    if ($path =~ m|kpac/getit_results|) {
+        return $self->load_getit_results;
+    } elsif ($path =~ m|kpac/getit|) {
+        return $self->load_getit;
+    }
 
     # ----------------------------------------------------------------
     #  Everything below here requires authentication

commit e84f1af9274df0c02bbf9c48ee78842726d69fb5
Author: Terran McCanna <tmccanna at georgialibraries.org>
Date:   Wed Feb 24 17:17:27 2016 -0500

    LP#1548869 KPAC hold results screen not displaying complete info
    
    The getit_results.tt2 page was not displaying item title after
    hold placement or after adding to a list. It was also not pulling
    in the item id (which was needed for navigational links back to the
    record) and was not pulling in the list name after adding an item
    to a named list.
    
    This patch adds some logic to prevent subroutine conflicts, adds
    missing parameters to a function call, and corrects a variable name.
    
    To test:
    
    Log in to the KPAC and perform the following actions:
    
    1. Place a successful hold (results screen should show item title
       and pickup library, and provide links back to record page).
    2. Place an unsuccessful hold (try placing a hold on an item you
       already have a hold on - the results screen should show the item
       title).
    3. Add item to a temporary list (results screen should show item title).
    4. Add item to a named list (results screen should show item title and
       title of list it was added to).
    
    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
    Signed-off-by: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
index 32e394b..cdd73a5 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
@@ -36,8 +36,12 @@ sub load {
     # ----------------------------------------------------------------
     return $self->redirect_ssl unless $self->cgi->https;
 
-    return $self->load_getit_results if $path =~ m|kpac/getit_results|;
-    return $self->load_getit if $path =~ m|kpac/getit|;
+	#logic added to resolve path-matching conflict
+	if ($path =~ m|kpac/getit_results|) {
+	    return $self->load_getit_results;
+	} elsif ($path =~ m|kpac/getit|) {
+	    return $self->load_getit;
+	}
 
     # ----------------------------------------------------------------
     #  Everything below here requires authentication
@@ -209,7 +213,8 @@ sub load_getit_results {
     my $hold_id = $self->cgi->param('hold');
     my $rec_id = $ctx->{page_args}->[0];
 
-    my (undef, @rec_data) = $self->get_records_and_facets([$rec_id]);
+    my (undef, @rec_data) = $self->get_records_and_facets([$rec_id], undef, 
+                {flesh => '{mra,holdings_xml,acp,exclude_invisible_acn}'});
     $ctx->{bre_id} = $rec_data[0]->{id};
     $ctx->{marc_xml} = $rec_data[0]->{marc_xml};
 
diff --git a/Open-ILS/src/templates/kpac/getit_results.tt2 b/Open-ILS/src/templates/kpac/getit_results.tt2
index 18b12ea..70e9803 100644
--- a/Open-ILS/src/templates/kpac/getit_results.tt2
+++ b/Open-ILS/src/templates/kpac/getit_results.tt2
@@ -18,7 +18,7 @@
         [% l('To manage your lists, go to [_1]My Lists[_2]', '<a href="' _ mkurl(ctx.opac_root _ '/myopac/lists', {}, 1) _ '">', '</a>') %]
         <p>
     [% ELSIF ctx.added_to_list %]
-        [% list_html = ctx.list.name | html %]
+        [% list_html = ctx.added_to_list.name | html %]
         <h2 class="sub_header2">[% l('You Saved It!') %]</h2>
         <p>
         [% l('You successfully saved [_1] to [_2].', title_html, list_html) %]<br/>

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

Summary of changes:
 .../src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm   |   11 ++++++++---
 Open-ILS/src/templates/kpac/getit_results.tt2      |    2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS