[open-ils-commits] [GIT] Evergreen ILS branch master updated. 315beb4572e9c13a928f59f6fe4f23cc4e4d13b3

[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  315beb4572e9c13a928f59f6fe4f23cc4e4d13b3 (commit)
      from  ba689b93cc120ea22f0be821762157c0bad4e2eb (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 315beb4572e9c13a928f59f6fe4f23cc4e4d13b3
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Thu Jan 7 14:34:18 2016 -0500

    LP#1531976: fix bringing up Mesage Center and Triggered Events
    
    This patch fixes a bug in the XUL staff client where
    using Other -> Triggered Events from the patron page,
    then Other -> Message Center, only brings up the Triggered
    Events page in both cases (and vice versa).
    
    This patch works by preventing the deck code from thinking they are
    the same page, despite both using the browser wrapper as their base URL.
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/xul/staff_client/server/patron/display.js b/Open-ILS/xul/staff_client/server/patron/display.js
index bf3ff02..7eaca57 100644
--- a/Open-ILS/xul/staff_client/server/patron/display.js
+++ b/Open-ILS/xul/staff_client/server/patron/display.js
@@ -336,7 +336,7 @@ patron.display.prototype = {
                         ['command'],
                         function(ev) {
                             obj.right_deck.set_iframe(
-                                xulG.url_prefix(urls.XUL_REMOTE_BROWSER),
+                                xulG.url_prefix(urls.XUL_REMOTE_BROWSER) + '?triggered_events',
                                 {},
                                 {
                                     'url': urls.EG_TRIGGER_EVENTS + "?patron_id=" + obj.patron.id(),
@@ -350,7 +350,7 @@ patron.display.prototype = {
                         ['command'],
                         function(ev) {
                             obj.right_deck.set_iframe(
-                                xulG.url_prefix(urls.XUL_REMOTE_BROWSER),
+                                xulG.url_prefix(urls.XUL_REMOTE_BROWSER) + '?message_center',
                                 {},
                                 {
                                     'url': urls.EG_PATRON_MESSAGE_CENTER + "/" + obj.patron.id(),

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

Summary of changes:
 Open-ILS/xul/staff_client/server/patron/display.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS