remove redundant (and broken) code so alternate pull list works again; thanks to...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@9698 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xul b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xul
deleted file mode 100644 (file)
index 1df350c..0000000
--- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xul
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-<!-- Application: Evergreen Staff Client -->
-<!-- Screen: Patron Display -->
-
-<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-<!-- STYLESHEETS -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://open_ils_staff_client/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="/xul/server/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="/xul/server/skin/circ.css" type="text/css"?>
-
-<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-<!-- LOCALIZATION -->
-<!DOCTYPE window PUBLIC "" ""[
-       <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
-]>
-
-<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-<!-- OVERLAYS -->
-<?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
-<?xul-overlay href="/xul/server/patron/holds_overlay.xul"?>
-
-<window id="holds_win" 
-       onload="try { my_init(); font_helper(); } catch(E) { alert(E); }"
-       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-       <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
-       <!-- BEHAVIOR -->
-        <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
-        <scripts id="openils_util_scripts"/>
-
-       <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
-       <script>
-       <![CDATA[
-               function my_init() {
-                       try {
-                               netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-                               if (typeof JSAN == 'undefined') { throw( document.getElementById("commonStrings").getString('common.jsan.missing') ); }
-                               JSAN.errorLevel = "die"; // none, warn, or die
-                               JSAN.addRepository('/xul/server/');
-                               JSAN.use('util.error'); g.error = new util.error();
-                               g.error.sdump('D_TRACE','my_init() for holds.xul');
-
-                               JSAN.use('patron.holds'); g.holds = new patron.holds();
-                               g.holds.init( 
-                                       { 
-                                               'tree_id' : 'holds_list',
-                                               'patron_id' : xul_param('patron_id'),
-                                               'docid' : xul_param('docid'),
-                                               'shelf' : xul_param('shelf'),
-                                               'pull' : xul_param('pull'),
-                                       } 
-                               );
-                               window.refresh = function(p) { g.holds.retrieve(p); }
-
-                               default_focus();
-
-                       } catch(E) {
-                               var err_msg = document.getElementById("commonStrings").getFormattedString('common.exception', ['patron/holds.xul', E]);
-                               try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-                               alert(err_msg);
-                       }
-               }
-
-               function default_focus() { try { document.getElementById('holds_print').focus(); } catch(E) { } }
-
-       ]]>
-       </script>
-
-       <commandset id="holds_cmds">
-               <command id="sel_mark_items_damaged" disabled="true"/>
-               <command id="sel_mark_items_missing" disabled="true"/>
-               <command id="sel_copy_details" disabled="true"/>
-               <command id="sel_patron" disabled="true"/>
-               <command id="sel_clip" />
-               <command id="cmd_holds_print" />
-               <command id="cmd_show_catalog" />
-               <command id="cmd_retrieve_patron" />
-               <command id="cmd_show_notifications" />
-               <command id="cmd_holds_edit_pickup_lib" />
-               <command id="cmd_holds_edit_phone_notify" />
-               <command id="cmd_holds_edit_email_notify" />
-               <command id="cmd_holds_edit_selection_depth" disabled="true" hidden="true"/>
-               <command id="cmd_broken" disabled="true" hidden="true"/>
-               <command id="cmd_holds_retarget"/>
-               <command id="cmd_holds_cancel" />
-               <command id="save_columns" />
-       </commandset>
-
-       <popupset id="holds_popupset"/>
-
-       <box id="holds_main" />
-
-</window>
-

diff --git a/Open-ILS/xul/staff_client/server/admin/index.xhtml b/Open-ILS/xul/staff_client/server/admin/index.xhtml
index 6100744..b5037f6 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/index.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/index.xhtml
@@ -70,7 +70,7 @@
                                                        </div>
                                                </td><td>
                                                        <div style='padding: 8px;'>
-                                                               <a href='javascript:_l("hold_pull_list.xul");'>&staff.server.admin.index.hold_pull_list;</a> <span style="color: red">&staff.server.admin.index.testing;</span>
+                                                               <a href='javascript:window.xulG.new_tab("/xul/server/patron/holds.xul",{"tab_name":"&staff.server.admin.index.hold_pull_list;"},{});'>&staff.server.admin.index.hold_pull_list;</a> <span style="color: red">&staff.server.admin.index.testing;</span>
                                                        </div>
                                                        <div style='padding: 8px;'>
                                                                <a href='javascript:_l("hold_pull_list_classic.xhtml");'>&staff.server.admin.index.hold_pull_list_classic;</a> <span style="color: red">&staff.server.admin.index.testing;</span>