From: phasefx Date: Mon, 31 Jul 2006 23:20:50 +0000 (+0000) Subject: copy editor can now remove stat cats X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=04596dc260b96aac9ec6efef285753f59b396c6c;p=evergreen%2Fpines.git copy editor can now remove stat cats git-svn-id: svn://svn.open-ils.org/ILS/trunk@5208 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/xul/staff_client/server/cat/copy_browser.js b/Open-ILS/xul/staff_client/server/cat/copy_browser.js index 8bcc6fda35..a418909a23 100644 --- a/Open-ILS/xul/staff_client/server/cat/copy_browser.js +++ b/Open-ILS/xul/staff_client/server/cat/copy_browser.js @@ -243,7 +243,7 @@ cat.copy_browser.prototype = { for (var i in acn_hash) acn_list.push( acn_hash[i] ); var robj = obj.network.simple_request( 'FM_ACN_TREE_UPDATE', - [ ses(), acn_list ], + [ ses(), acn_list, true ], null, { 'title' : 'Override Delete Failure?', @@ -447,7 +447,7 @@ cat.copy_browser.prototype = { var r = obj.network.request( api.FM_ACN_TREE_UPDATE.app, api.FM_ACN_TREE_UPDATE.method, - [ ses(), volumes ] + [ ses(), volumes, true ] ); if (typeof r.ilsevent != 'undefined') throw(r); } catch(E) { @@ -488,7 +488,7 @@ cat.copy_browser.prototype = { } var robj = obj.network.simple_request( 'FM_ACN_TREE_UPDATE', - [ ses(), list ], + [ ses(), list, true ], null, { 'title' : 'Override Delete Failure?', diff --git a/Open-ILS/xul/staff_client/server/cat/copy_buckets.js b/Open-ILS/xul/staff_client/server/cat/copy_buckets.js index 5a3069b45b..f485a322bb 100644 --- a/Open-ILS/xul/staff_client/server/cat/copy_buckets.js +++ b/Open-ILS/xul/staff_client/server/cat/copy_buckets.js @@ -407,7 +407,7 @@ cat.copy_buckets.prototype = { copies[i].ischanged( 1 ); } - var robj = obj.network.simple_request('FM_ACP_FLESHED_BATCH_UPDATE', [ ses(), copies ]); + var robj = obj.network.simple_request('FM_ACP_FLESHED_BATCH_UPDATE', [ ses(), copies, true ]); obj.render_pending_copies(); // FIXME -- need a generic refresh for lists setTimeout( diff --git a/Open-ILS/xul/staff_client/server/cat/copy_editor.js b/Open-ILS/xul/staff_client/server/cat/copy_editor.js index fe27fd4941..dfd93a795b 100644 --- a/Open-ILS/xul/staff_client/server/cat/copy_editor.js +++ b/Open-ILS/xul/staff_client/server/cat/copy_editor.js @@ -134,8 +134,8 @@ function my_init() { { render: 'var l = util.functional.find_list( fm.stat_cat_entries(), function(e){ return e.stat_cat() == ' + sc.id() + '; } ); l ? l.value() : "";', - input: 'c = function(v){ g.apply_stat_cat(' + sc.id() + ',v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( g.data.hash.asc[' + sc.id() - + '].entries(), function(obj){ return [ obj.value(), obj.id() ]; } ).sort() ); ' + input: 'c = function(v){ g.apply_stat_cat(' + sc.id() + ',v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ "", -1 ] ].concat( util.functional.map_list( g.data.hash.asc[' + sc.id() + + '].entries(), function(obj){ return [ obj.value(), obj.id() ]; } ) ).sort() ); ' //input: 'c = function(v){ g.apply_stat_cat(' + sc.id() + ',v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ "", null ] ].concat( util.functional.map_list( g.data.hash.asc[' + sc.id() // + '].entries(), function(obj){ return [ obj.value(), obj.id() ]; } ).sort() ) ); ' + 'x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c),false);', @@ -317,7 +317,7 @@ g.apply = function(field,value) { } /******************************************************************************************************/ -/* Apply a stat cat entry to all the copies being edited */ +/* Apply a stat cat entry to all the copies being edited. An entry_id of < 0 signifies the stat cat is being removed. */ g.apply_stat_cat = function(sc_id,entry_id) { g.error.sdump('D_TRACE','sc_id = ' + sc_id + ' entry_id = ' + entry_id + '\n'); @@ -333,7 +333,7 @@ g.apply_stat_cat = function(sc_id,entry_id) { return (obj.stat_cat() != sc_id); } ); - temp.push( + if (entry_id > -1) temp.push( util.functional.find_id_object_in_list( g.data.hash.asc[sc_id].entries(), entry_id @@ -866,8 +866,9 @@ g.stash_and_close = function() { var r = g.network.request( api.FM_ACP_FLESHED_BATCH_UPDATE.app, api.FM_ACP_FLESHED_BATCH_UPDATE.method, - [ ses(), g.copies ] + [ ses(), g.copies, true ] ); + alert('pause'); if (typeof r.ilsevent != 'undefined') { g.error.standard_unexpected_error_alert('copy update',r); } diff --git a/Open-ILS/xul/staff_client/server/cat/util.js b/Open-ILS/xul/staff_client/server/cat/util.js index 3ef3b48274..cfe5ec6d0c 100644 --- a/Open-ILS/xul/staff_client/server/cat/util.js +++ b/Open-ILS/xul/staff_client/server/cat/util.js @@ -113,7 +113,7 @@ cat.util.spawn_copy_editor = function(list,edit) { var r = obj.network.request( api.FM_ACP_FLESHED_BATCH_UPDATE.app, api.FM_ACP_FLESHED_BATCH_UPDATE.method, - [ ses(), copies ] + [ ses(), copies, true ] ); /* FIXME -- revisit the return value here */ } catch(E) { diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js index 93cdfa13bd..7e5159564d 100644 --- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js +++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js @@ -384,7 +384,7 @@ g.stash_and_close = function() { var r = g.network.request( api.FM_ACN_TREE_UPDATE.app, api.FM_ACN_TREE_UPDATE.method, - [ ses(), volumes ] + [ ses(), volumes, true ] ); if (typeof r.ilsevent != 'undefined') { switch(r.ilsevent) {