From 6a3ac7e07105e1486512e6254a3fe04563e2663d Mon Sep 17 00:00:00 2001 From: phasefx Date: Tue, 30 Aug 2005 15:14:31 +0000 Subject: [PATCH] Retrieving the org tree via API instead of file to get .shortname() again. Eventually we'll want client-side caching of this. One day I want to rewrite the copy browser using the newer paged tree shell git-svn-id: svn://svn.open-ils.org/ILS/trunk@1771 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../chrome/content/evergreen/auth/auth.js | 36 ++++++---- .../content/evergreen/cat/browse_list.js | 35 +++++++--- .../evergreen/cat/browse_list_overlay.xul | 69 +++++++------------ 3 files changed, 69 insertions(+), 71 deletions(-) diff --git a/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js b/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js index 0bbd237c38..0b5f48fa46 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js +++ b/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js @@ -309,12 +309,30 @@ function user_callback(request) { mw.G.user_ou = user.home_ou(); sdump('D_AUTH', "user: " + js2JSON(mw.G['user']) + '\n'); sdump('D_AUTH', "user_ou: " + js2JSON(mw.G['user_ou']) + '\n'); - /*user_async_request( - 'open-ils.search', - 'open-ils.search.actor.org_tree.retrieve', + user_async_request( + 'open-ils.actor', + 'open-ils.actor.org_tree.retrieve', [], org_tree_callback - );*/ + ); + incr_progressmeter(document,'auth_meter',auth_meter_incr); +} + +function org_tree_callback(request) { + var org_tree; + try { + org_tree = request.getResultObject(); + if (!org_tree) { throw('null result'); } + if (typeof(org_tree) != 'object') { throw('result not an object' + org_tree); } + } catch(E) { + alert('Login failed on org_tree: ' + js2JSON(E)); enable_login_prompts(); return; + } + + //mw.G.org_tree = globalOrgTree; + mw.G.org_tree = org_tree; + mw.G.org_tree_hash = convert_object_list_to_hash( flatten_ou_branch( mw.G.org_tree ) ); + mw.G.user_ou = find_ou( mw.G.org_tree, mw.G.user_ou ); + /*user_async_request( 'open-ils.actor', 'open-ils.actor.org_types.retrieve', @@ -322,7 +340,6 @@ function user_callback(request) { org_type_callback );*/ org_type_callback(); - incr_progressmeter(document,'auth_meter',auth_meter_incr); } function org_type_callback(request) { @@ -337,15 +354,7 @@ function org_type_callback(request) { alert('Login failed on aout_list: ' + js2JSON(E)); enable_login_prompts(); return; }*/ mw.G.aout_list = aout_list; - dump('auth 0\n'); mw.G.aout_hash = convert_object_list_to_hash( aout_list ); - dump('auth 1\n'); - mw.G.org_tree = globalOrgTree; - dump('auth 2\n'); - mw.G.org_tree_hash = convert_object_list_to_hash( flatten_ou_branch( globalOrgTree ) ); - dump('auth 3\n'); - mw.G.user_ou = find_ou( mw.G.org_tree, mw.G.user_ou ); - dump('auth 4\n'); user_async_request( 'open-ils.actor', @@ -354,7 +363,6 @@ function org_type_callback(request) { my_orgs_callback ); incr_progressmeter(document,'auth_meter',auth_meter_incr); - } function my_orgs_callback(request) { diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list.js b/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list.js index 9ab6e71b73..2654eed3e6 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list.js +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list.js @@ -257,7 +257,7 @@ function gather_copies_callback(request) { //mw.sdump('D_CAT','\nvolume = ' + js2JSON(volume) + '\n'); mw.sdump('D_CAT',' volume id = ' + volume.id() + '\n'); var lib = find_ou( mw.G.org_tree, volume.owning_lib() ); - //mw.sdump('D_CAT','lib = ' + js2JSON(lib) + '\n'); + mw.sdump('D_CAT','+++++++++++++++++++++++++++++++++++++++++++++++++++++++lib = ' + js2JSON(lib) + '\n'); if ( lib.id() == mw.G.user_ou.id() ) { flag = true; } var callnumber = volume.label(); var copies = volume.copies(); @@ -346,16 +346,29 @@ function gather_copies_callback(request) { treeitem.appendChild(treerow); var list = [ - copy.barcode() , '', '', lib.shortname() , callnumber , copy.copy_number() , - //find_id_object_in_list( mw.G.acpl_list, copy.location() ).name() , - mw.G.acpl_hash[ copy.location() ].name() , - //find_ou( mw.G.org_tree, copy.circ_lib() ).shortname() , - mw.G.org_tree_hash[ copy.circ_lib() ].shortname(), - yesno( copy.circulate() ) , yesno( copy.ref() ) , - yesno( copy.opac_visible() ) , copy.circ_as_type() , copy.circ_modifier() , - copy.loan_duration() , copy.fine_level() , copy.create_date() , - copy.creator() , copy.edit_date() , copy.editor() , copy.deposit() , - copy.deposit_amount() , copy.price() , mw.G.ccs_hash[ copy.status() ].name() + copy.barcode() , + '', + '', + lib.shortname() , + callnumber , + copy.copy_number() , + copy.location(), //mw.G.acpl_hash[ copy.location() ].name() , + copy.circ_lib(), //mw.G.org_tree_hash[ copy.circ_lib() ].shortname(), + yesno( copy.circulate() ) , + yesno( copy.ref() ) , + yesno( copy.opac_visible() ) , + copy.circ_as_type() , + copy.circ_modifier() , + copy.loan_duration() , + copy.fine_level() , + copy.create_date() , + copy.creator() , + copy.edit_date() , + copy.editor() , + yesno( copy.deposit() ), + copy.deposit_amount() , + copy.price() , + mw.G.ccs_hash[ copy.status() ].name() ]; for (var i = 0; i < list.length; i++ ) { diff --git a/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list_overlay.xul index 3b52e0cc5d..269e584389 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list_overlay.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/cat/browse_list_overlay.xul @@ -58,52 +58,29 @@ - - - - - - - - - - - -- 2.43.2