[open-ils-commits] [GIT] Evergreen ILS branch rel_2_8 updated. f9a21985471f306ef9542a09994b79429541abd7

[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_8 has been updated
       via  f9a21985471f306ef9542a09994b79429541abd7 (commit)
      from  f6cc9984d0070d46131edccb3eb6821c7c77e5e2 (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 f9a21985471f306ef9542a09994b79429541abd7
Author: Terran McCanna <tmccanna at georgialibraries.org>
Date:   Wed Jun 10 15:44:46 2015 -0400

    LP#1396263: Fix for 'Return to Record' link breaks after texting
    
    If user is already logged into OPAC when texting a call number from
    the record screen, the 'Return to Record' link works properly. However,
    if user is not logged in and is prompted to log in first, the 'Return to
    Record' link actually returns the user to 'My Account.' This patch
    corrects that problem and returns the user to the record regardless of
    whether they were initially logged in or not.
    
    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index eeb8643..c87c27e 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -98,7 +98,9 @@ END; # FOREACH bib
                 <link property="businessFunction" href="http://purl.org/goodrelations/v1#LeaseOut">
                 <meta property="price" content="0.00">
             </td>[% END %]
-            <td><span property="sku">[% callnum | html %]</span> [% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %](<a href="[% mkurl(ctx.opac_root _ '/sms_cn', {copy_id => copy_info.id}) %]" rel="nofollow" vocab="">Text</a>)[% END %]</td>
+            <td><span property="sku">[% callnum | html %]</span> [% IF ctx.get_org_setting(CGI.param('loc') 
+                OR ctx.aou_tree.id, 'sms.enable') == 1 %](<a href="[% mkurl(ctx.opac_root _ '/sms_cn', 
+               {copy_id => copy_info.id}) %];rec=[%- ctx.bre_id -%]" rel="nofollow" vocab="">Text</a>)[% END %]</td>
             [%- IF has_parts == 'true' %]
             <td>[% copy_info.part_label | html %]</td>
             [%- END %]
diff --git a/Open-ILS/src/templates/opac/sms_cn.tt2 b/Open-ILS/src/templates/opac/sms_cn.tt2
index 4a7422c..7c958d1 100644
--- a/Open-ILS/src/templates/opac/sms_cn.tt2
+++ b/Open-ILS/src/templates/opac/sms_cn.tt2
@@ -13,6 +13,12 @@
                 <p>
                     [% IF ctx.event != -1 %]
                     <br/>
+
+                    [% IF ctx.origin.search('redirect');
+                        SET ctx.origin = ctx.opac_root _ '/record/' _ CGI.url_param('rec') _ '?query=' _
+                        CGI.url_param('query') _ ';qtype=' _ CGI.url_param('qtype') _ ';locg=' _ CGI.url_param('locg');
+                    END %]
+
                     [% IF ctx.sms_notify %]
                     <h1>[% l('Your message has been sent!') %]</h1>
                     <a href="[% ctx.origin %]">[% l('Return to record') %]</a>

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

Summary of changes:
 .../src/templates/opac/parts/record/copy_table.tt2 |    4 +++-
 Open-ILS/src/templates/opac/sms_cn.tt2             |    6 ++++++
 2 files changed, 9 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS