[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch rel_2_6 updated. 7c2208d17a3c5a973a0da16149211611fcd78bff

[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_6 has been updated
       via  7c2208d17a3c5a973a0da16149211611fcd78bff (commit)
       via  8fce6a272cfcb5746ab7f2e48d6394fcf4b063c9 (commit)
      from  3697615954a56cf5999edf266ee809e655e2768e (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 7c2208d17a3c5a973a0da16149211611fcd78bff
Author: Mike Rylander <mrylander at gmail.com>
Date:   Thu Nov 6 16:03:36 2014 -0500

    LP#1390225: Fail to care about errors from auth.session.delete
    
    We're just tossing this call over the wall and moving on.  We don't
    care if the session wasn't there to delete or even if we didn't pass
    a session to the server.
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    
    Conflicts:
    	Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
index 7fe805b..1c6f444 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
@@ -464,6 +464,14 @@ sub load_logout {
     # while logged in, go ahead and clear it out.
     $self->clear_anon_cache;
 
+    try { # a missing auth token will cause an ugly explosion
+        $U->simplereq(
+            'open-ils.auth',
+            'open-ils.auth.session.delete',
+            $self->cgi->cookie(COOKIE_SES)
+        );
+    } catch Error with {};
+
     return $self->generic_redirect(
         $redirect_to || $self->ctx->{home_page},
         [

commit 8fce6a272cfcb5746ab7f2e48d6394fcf4b063c9
Author: Mike Rylander <mrylander at gmail.com>
Date:   Thu Nov 6 15:36:16 2014 -0500

    LP#1390225: redirect to ctx.home_page instead of through ctx.logout_page
    
    This way, we skip the auth.session.delete call that will error out because
    we no longer have the authtoken cookie.
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/src/templates/opac/parts/base.tt2 b/Open-ILS/src/templates/opac/parts/base.tt2
index 2513973..03e950d 100644
--- a/Open-ILS/src/templates/opac/parts/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/base.tt2
@@ -6,7 +6,7 @@
         [% IF ctx.refresh %]
         <meta http-equiv="refresh" content="[% ctx.refresh %]" />
         [% ELSIF ctx.authtime AND !ctx.is_staff %]
-        <meta http-equiv="refresh" content="[% ctx.authtime %]; url=[% ctx.logout_page %]" />
+        <meta http-equiv="refresh" content="[% ctx.authtime %]; url=[% ctx.home_page %]" />
         [% END %]
         <meta name = "viewport" content = "initial-scale = 1.0">
         <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/default/opac/semiauto.css" />

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

Summary of changes:
 .../src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm    |    8 ++++++++
 Open-ILS/src/templates/opac/parts/base.tt2         |    2 +-
 2 files changed, 9 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS