From f1f78f415b9505eb1a71e858e293fd981110c132 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Mon, 25 Feb 2013 13:17:59 -0500
Subject: [PATCH] Z39 Batch : TPAC List Action

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
 .../perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm |  7 +++++++
 Open-ILS/src/templates/opac/myopac/lists.tt2        | 21 +++++++++++++++++++++
 2 files changed, 28 insertions(+)

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 337ee52f31..2922245bfc 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
@@ -23,6 +23,10 @@ sub prepare_extended_user_info {
     my $local_xact = !$e->{xact_id}; 
     $e->xact_begin if $local_xact;
 
+    # keep the original user object so we can restore
+    # login-specific data (e.g. workstation)
+    my $usr = $self->ctx->{user};
+
     $self->ctx->{user} = $self->editor->retrieve_actor_user([
         $self->ctx->{user}->id,
         {
@@ -36,6 +40,9 @@ sub prepare_extended_user_info {
 
     $e->rollback if $local_xact;
 
+    $self->ctx->{user}->wsid($usr->wsid);
+    $self->ctx->{user}->ws_ou($usr->ws_ou);
+
     # discard replaced (negative-id) addresses.
     $self->ctx->{user}->addresses([
         grep {$_->id > 0} @{$self->ctx->{user}->addresses} ]);
diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2
index 5347d34885..6372606e79 100644
--- a/Open-ILS/src/templates/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/lists.tt2
@@ -151,6 +151,27 @@
                     [% END %]
                 </div>
             </form>
+            [% IF ctx.is_staff %]
+            <div class="bookbag-controls">
+                <input 
+                    type="submit" 
+                    onclick='
+                       var path = 
+                          "oils://remote/xul/server/cat/bucketz39_dialog.xul";
+                        window.openDialog(
+                            xulG.url_prefix(path),
+                            "bucketz39_dialog",
+                            "width=800,height=500",
+                            "[% ctx.user.id %]",
+                            "[% ctx.authtoken %]",
+                            "[% ctx.user.ws_ou %]",
+                            "[% bbag.id %]",
+                            xulG
+                        )'
+                    value="[% l('Locate Z39.59 Matches') %]" 
+                />
+            </div>
+            [% END %]
             <div class="bookbag-controls">
                 [% IF bbag.pub == 't'; %]
                 <a target='_blank' href='/opac/extras/feed/bookbag/rss2-full/[% bbag.id %]'><img
-- 
2.11.0