@@ -382,27 +370,17 @@ parent : ou_type_store.getValue( current_type, 'id' ) }); var err = false; - pCRUD.request({ - method : 'open-ils.permacrud.create.aout', - timeout : 10, - params : [ ses, new_fm_obj ], + pCRUD.create(new_fm_obj, { onerror : function (r) { highlighter.editor_pane.red.play(); status_update( aout_strings.ERROR_CALLING_METHOD_AOUT ); err = true; }, - oncomplete : function (r) { - var res = r.recv(); - if ( res && res.content() ) { - ou_type_store.newItem( - res.content().toHash(), - { parent : current_type, attribute : 'children' } - ); - } else { - highlighter.editor_pane.red.play(); - status_update( aout_strings.ERROR_CREATING_CHILD_AOUT ); - err = true; - } + oncomplete : function (r, list) { + ou_type_store.newItem( + list[0].toHash(), + { parent : current_type, attribute : 'children' } + ); }, }).send(); diff --git a/Open-ILS/web/conify/global/actor/org_unit_type.js b/Open-ILS/web/conify/global/actor/org_unit_type.js index cf4a97ffb5..f3fb76033a 100644 --- a/Open-ILS/web/conify/global/actor/org_unit_type.js +++ b/Open-ILS/web/conify/global/actor/org_unit_type.js @@ -18,6 +18,7 @@ dojo.require('fieldmapper.AutoIDL'); dojo.require('fieldmapper.dojoData'); dojo.require('openils.widget.TranslatorPopup'); +dojo.require('openils.PermaCrud'); dojo.require('dojo.parser'); dojo.require('dojo.data.ItemFileWriteStore'); dojo.require('dojo.date.stamp'); @@ -40,7 +41,7 @@ dojo.requireLocalization("openils.conify", "conify"); var cgi = new CGI(); var cookieManager = new HTTP.Cookies(); var ses = cookieManager.read('ses') || cgi.param('ses'); -var pCRUD = new OpenSRF.ClientSession('open-ils.permacrud'); +var pCRUD = new openils.PermaCrud({authtoken:ses}); var current_type; var current_fm_type; @@ -63,25 +64,16 @@ function save_type () { save_out_button.disabled = false; delete_out_button.disabled = false; - pCRUD.request({ - method : 'open-ils.permacrud.update.aout', - timeout : 10, - params : [ ses, modified_aout ], + pCRUD.update(modified_aout, { onerror : function (r) { highlighter.editor_pane.red.play(); status_update( dojo.string.substitute(aout_strings.ERROR_SAVING_DATA, [ou_type_store.getValue( current_type, 'name' )] ) ); }, oncomplete : function (r) { - var res = r.recv(); - if ( res && res.content() ) { - ou_type_store.setValue( current_type, 'ischanged', 0 ); - highlighter.editor_pane.green.play(); - status_update( dojo.string.substitute(aout_strings.SUCCESS_SAVING_DATA, [ou_type_store.getValue( current_type, 'name' )] ) ); - } else { - highlighter.editor_pane.red.play(); - status_update( dojo.string.substitute(aout_strings.ERROR_SAVING_DATA, [ou_type_store.getValue( current_type, 'name' )] ) ); - } - }, - }).send(); + ou_type_store.setValue( current_type, 'ischanged', 0 ); + highlighter.editor_pane.green.play(); + status_update( dojo.string.substitute(aout_strings.SUCCESS_SAVING_DATA, [ou_type_store.getValue( current_type, 'name' )] ) ); + } + }); } diff --git a/Open-ILS/web/conify/global/config/copy_status.html b/Open-ILS/web/conify/global/config/copy_status.html index 1df6d02d64..2fa14c9a56 100644 --- a/Open-ILS/web/conify/global/config/copy_status.html +++ b/Open-ILS/web/conify/global/config/copy_status.html @@ -63,69 +63,57 @@ - - - - -

- - if (confirmation) { - for (var i in window.dirtyStore) { - window.current_status = window.dirtyStore[i]; - save_status(true); - } - } - } + - }); - } - }).send(); -]]> - + + +

&conify.copy_status.new_status.label; @@ -142,30 +130,20 @@ }); var err = false; - pCRUD.request({ - method : 'open-ils.permacrud.create.ccs', - timeout : 10, - params : [ ses, new_fm_obj ], + pCRUD.create(new_fm_obj, { onerror : function (r) { highlighter.red.play(); status_update( ccs_strings.ERROR_CALLING_METHOD_CCS ); err = true; }, - oncomplete : function (r) { - var res = r.recv(); - if ( res && res.content() ) { - var new_item_hash = res.content().toHash(); - status_store.newItem( new_item_hash ); - status_update( dojo.string.substitute(ccs_strings.SUCCESS_CREATING_STATUS, [new_item_hash.name]) ); - status_grid.model.sort(-2); - highlighter.green.play(); - } else { - highlighter.red.play(); - status_update( ccs_strings.ERROR_CREATING_STATUS ); - err = true; - } + oncomplete : function (r, list) { + var new_item_hash = list[0].toHash(); + status_store.newItem( new_item_hash ); + status_update( dojo.string.substitute(ccs_strings.SUCCESS_CREATING_STATUS, [new_item_hash.name]) ); + status_grid.model.sort(-2); + highlighter.green.play(); } - }).send(); + }); ]]> @@ -191,6 +169,9 @@ { name : ccs_strings.TRANSLATION, width : "10em", height : "2em", + formatter: function (row) { + return ''; + }, get : function (row) { if (!window.status_rows) window.status_rows = []; var r = window.status_data_model.getRow(row); @@ -203,7 +184,7 @@ 'status_grid.rowHeightChanged('+row+')', 0 ); - return ''; + return row; } return ''; } @@ -272,36 +253,26 @@ var modified_ccs = new ccs().fromStoreItem( current_status ); modified_ccs.isdeleted( 1 ); - pCRUD.request({ - method : 'open-ils.permacrud.delete.ccs', - timeout : 10, - params : [ ses, modified_ccs ], + pCRUD.eliminate(modified_ccs, { onerror : function (r) { highlighter.red.play(); status_update( dojo.string.substitute( ccs_strings.ERROR_DELETING, [status_store.getValue( current_status, 'name' )] ) ); }, oncomplete : function (r) { - var res = r.recv(); - if ( res && res.content() ) { - - var old_name = status_store.getValue( current_status, 'name' ); + var old_name = status_store.getValue( current_status, 'name' ); - status_store.fetch({ - query : { id : status_store.getValue( current_status, 'id' ) }, - onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } }, - scope : status_store - }); + status_store.fetch({ + query : { id : status_store.getValue( current_status, 'id' ) }, + onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } }, + scope : status_store + }); - current_status = null; + current_status = null; - highlighter.green.play(); - status_update( dojo.string.substitute(ccs_strings.STATUS_DELETED, [old_name]) ); - } else { - highlighter.red.play(); - status_update( dojo.string.substitute(ccs_strings.ERROR_DELETING, [old_name]) ); - } + highlighter.green.play(); + status_update( dojo.string.substitute(ccs_strings.STATUS_DELETED, [old_name]) ); } - }).send(); + }); } } @@ -312,5 +283,11 @@

+ + diff --git a/Open-ILS/web/conify/global/config/copy_status.js b/Open-ILS/web/conify/global/config/copy_status.js index 4b50a96ca9..a934f1a670 100644 --- a/Open-ILS/web/conify/global/config/copy_status.js +++ b/Open-ILS/web/conify/global/config/copy_status.js @@ -18,6 +18,7 @@ dojo.require('fieldmapper.AutoIDL'); dojo.require('fieldmapper.dojoData'); dojo.require('openils.widget.TranslatorPopup'); +dojo.require('openils.PermaCrud'); dojo.require('dojo.parser'); dojo.require('dojo.string'); dojo.require('dojo.data.ItemFileWriteStore'); @@ -36,7 +37,7 @@ dojo.requireLocalization("openils.conify", "conify"); var cgi = new CGI(); var cookieManager = new HTTP.Cookies(); var ses = cookieManager.read('ses') || cgi.param('ses'); -var pCRUD = new OpenSRF.ClientSession('open-ils.permacrud'); +var pCRUD = new openils.PermaCrud({authtoken:ses}); var current_status; var virgin_out_id = -1; @@ -54,26 +55,17 @@ function save_status () { var modified_ccs = new ccs().fromStoreItem( current_status ); modified_ccs.ischanged( 1 ); - pCRUD.request({ - method : 'open-ils.permacrud.update.ccs', - timeout : 10, - params : [ ses, modified_ccs ], + pCRUD.update(modified_ccs, { onerror : function (r) { highlighter.red.play(); status_update( dojo.string.substitute(ccs_strings.ERROR_SAVING_STATUS, [status_store.getValue( current_status, 'name' )]) ); }, oncomplete : function (r) { - var res = r.recv(); - if ( res && res.content() ) { - status_store.setValue( current_status, 'ischanged', 0 ); - highlighter.green.play(); - status_update( dojo.string.substitute(ccs_strings.SUCCESS_SAVE, [status_store.getValue( current_status, 'name' )]) ); - } else { - highlighter.red.play(); - status_update( dojo.string.substitute(ccs_strings.ERROR_SAVING_STATUS, [status_store.getValue( current_status, 'name' )]) ); - } - }, - }).send(); + status_store.setValue( current_status, 'ischanged', 0 ); + highlighter.green.play(); + status_update( dojo.string.substitute(ccs_strings.SUCCESS_SAVE, [status_store.getValue( current_status, 'name' )]) ); + } + }); } function save_them_all (event) { diff --git a/Open-ILS/web/conify/global/config/marc_code_maps.html b/Open-ILS/web/conify/global/config/marc_code_maps.html index 7974a4538e..7501bdcc0b 100644 --- a/Open-ILS/web/conify/global/config/marc_code_maps.html +++ b/Open-ILS/web/conify/global/config/marc_code_maps.html @@ -81,6 +81,9 @@ { name : cam_strings.LABEL_TRANSLATION, width : "10em", height : "2em", + formatter : function (row) { + return ''; + }, get : function (row) { if (!grid_row_object_cache.cam) grid_row_object_cache.cam = []; var r = this.grid.model.getRow(row); @@ -96,7 +99,7 @@ ); var oldnode = dojo.byId('value_translation_cam_' + row); if (oldnode) dijit.byNode(oldnode).destroyRecursive(); - return ''; + return row; } return ''; } @@ -104,6 +107,9 @@ { name : cam_strings.LABEL_TRANSLATION, width : "10em", height : "2em", + formatter : function (row) { + return ''; + }, get : function (row) { if (!grid_row_object_cache.cam) grid_row_object_cache.cam = []; var r = this.grid.model.getRow(row); @@ -119,7 +125,7 @@ ); var oldnode = dojo.byId('description_translation_cam_' + row); if (oldnode) dijit.byNode(oldnode).destroyRecursive(); - return ''; + return row; } return ''; } @@ -171,6 +177,9 @@ { name : cam_strings.LABEL_TRANSLATION, width : "10em", height : "2em", + formatter : function (row) { + return ''; + }, get : function (row) { if (!grid_row_object_cache[classname]) grid_row_object_cache[classname] = []; var r = this.grid.model.getRow(row); @@ -186,7 +195,7 @@ ); var oldnode = dojo.byId('value_translation_' + classname + '_' + row); if (oldnode) dijit.byNode(oldnode).destroyRecursive(); - return ''; + return row; } return ''; } diff --git a/Open-ILS/web/conify/global/config/marc_code_maps.js b/Open-ILS/web/conify/global/config/marc_code_maps.js index d8120c4d76..4589a9870b 100644 --- a/Open-ILS/web/conify/global/config/marc_code_maps.js +++ b/Open-ILS/web/conify/global/config/marc_code_maps.js @@ -18,6 +18,7 @@ dojo.require('fieldmapper.AutoIDL'); dojo.require('fieldmapper.dojoData'); dojo.require('openils.widget.TranslatorPopup'); +dojo.require('openils.PermaCrud'); dojo.require('dojo.cookie'); dojo.require('dojo.parser'); dojo.require('dojo.string'); @@ -40,7 +41,7 @@ console.log('loading marc_code_maps.js'); // some handy globals var cgi = new CGI(); var ses = dojo.cookie('ses') || cgi.param('ses'); -var pCRUD = new OpenSRF.ClientSession('open-ils.permacrud'); +var pCRUD = new openils.PermaCrud({authtoken:ses}); console.log('initialized pcrud session'); @@ -77,26 +78,16 @@ function save_code (classname) { if(classname == 'cam' || classname == 'clfm') obj.description( dojo.string.trim( obj.description() ) ); - pCRUD.request({ - method : 'open-ils.permacrud.update.' + classname, - timeout : 10, - params : [ ses, modified_ppl ], + pCRUD.update(obj, { onerror : function (r) { //highlighter.red.play(); status_update( dojo.string.substitute(cam_strings.ERROR_SAVING_DATA_CAM, [classname, obj.code()]) ); }, oncomplete : function (r) { - var res = r.recv(); - if ( res && res.content() ) { - stores[classname].setValue( current_item, 'ischanged', 0 ); - //highlighter.green.play(); - status_update( dojo.string.substitute(cam_strings.SUCCESS_SAVE, stores[classname].getValue( item, 'code' )) ); - } else { - //highlighter.red.play(); - status_update( dojo.string.substitute( cam_strings.ERROR_SAVING_DATA_CAM, [classname, stores[classname].getValue( item, 'code' )] ) ); - } - }, - }).send(); + stores[classname].setValue( current_item, 'ischanged', 0 ); + status_update( dojo.string.substitute(cam_strings.SUCCESS_SAVE, stores[classname].getValue( item, 'code' )) ); + } + }); } function save_them_all (event) { @@ -153,33 +144,21 @@ function delete_grid_selection(classname, grid ) { var obj = new fieldmapper[classname]().fromStoreItem( item ); obj.isdeleted( 1 ); - pCRUD.request({ - method : 'open-ils.permacrud.delete.' + classname, - timeout : 10, - params : [ ses, obj ], + pCRUD.eliminate(obj, { onerror : function (r) { //highlighter.red.play(); status_update( dojo.string.substitute( cam_strings.ERROR_DELETING, [grid.model.store.getValue( item, 'value' )] ) ); }, oncomplete : function (r) { - var res = r.recv(); - var old_name = grid.model.store.getValue( item, 'value' ); - if ( res && res.content() ) { - - grid.model.store.fetch({ - query : { code : grid.model.store.getValue( item, 'code' ) }, - onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } }, - scope : grid.model.store - }); + grid.model.store.fetch({ + query : { code : grid.model.store.getValue( item, 'code' ) }, + onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } }, + scope : grid.model.store + }); - //highlighter.green.play(); - status_update( dojo.string.substitute( cam_strings.STATUS_DELETED, [old_name] ) ); - } else { - //highlighter.red.play(); - status_update( dojo.string.substitute( cam_strings.ERROR_DELETING, [old_name] ) ); - } + status_update( dojo.string.substitute( cam_strings.STATUS_DELETED, [old_name] ) ); } - }).send(); + }); } } @@ -202,29 +181,19 @@ function create_marc_code (data) { new_fm_obj.isnew(1); var err = false; - pCRUD.request({ - method : 'open-ils.permacrud.create.' + cl, - timeout : 10, - params : [ ses, new_fm_obj ], + pCRUD.create(new_fm_obj, { onerror : function (r) { //highlighter.red.play(); status_update( dojo.string.substitute( cam_strings.ERROR_CALLING_METHOD_CAM, [cl] ) ); err = true; }, - oncomplete : function (r) { - var res = r.recv(); - if ( res && res.content() ) { - var new_item_hash = res.content().toHash(); - stores[cl].newItem( new_item_hash ); - status_update( dojo.string.substitute( cam_strings.SUCCESS_CREATING_CODE, [new_item_hash.code, cl] ) ); - //highlighter.green.play(); - } else { - //highlighter.red.play(); - status_update( cam_strings.ERROR_CREATING_PERMISSION ); - err = true; - } + oncomplete : function (r, list) { + var new_item_hash = list[0].toHash(); + stores[cl].newItem( new_item_hash ); + status_update( dojo.string.substitute( cam_strings.SUCCESS_CREATING_CODE, [new_item_hash.code, cl] ) ); + //highlighter.green.play(); } - }).send(); + }); return false; } diff --git a/Open-ILS/web/conify/global/permission/grp_tree.html b/Open-ILS/web/conify/global/permission/grp_tree.html index 7b550c39b4..fac68a559d 100644 --- a/Open-ILS/web/conify/global/permission/grp_tree.html +++ b/Open-ILS/web/conify/global/permission/grp_tree.html @@ -73,116 +73,84 @@ - + - dojo.addOnUnload( function (event) { save_them_all(); }); - } - - }).send(); -]]> - + + + + +

+ +

@@ -194,7 +162,7 @@ current_group = item; window.current_fm_group = new pgt().fromStoreItem(item); - perm_map_model.query = { grp : current_group ? current_group.id[0] : -1 }; + perm_map_model.query = { grp : current_group ? group_store.getValue(current_group,'id') : -1 }; perm_map_model.refresh(); perm_grid.refresh(); @@ -397,50 +365,40 @@ var modified_pgt = new pgt().fromStoreItem( current_group ); modified_pgt.isdeleted( 1 ); - server.pCRUD.request({ - method : 'open-ils.permacrud.delete.pgt', - timeout : 10, - params : [ ses, modified_pgt ], + server.pcrud.eliminate( modified_pgt, { onerror : function (r) { highlighter.editor_pane.red.play(); status_update( dojo.string.substitute( pgt_strings.CONFIRM_DELETE, [group_store.getValue( current_group, 'name' )]) ); }, oncomplete : function (r) { - var res = r.recv(); - if ( res && res.content() ) { - - var old_name = group_store.getValue( current_group, 'name' ); - - group_store.fetch({ - query : { id : group_store.getValue( current_group, 'id' ) }, - queryOptions : { deep : true }, - onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } }, - scope : group_store - }); - - current_group = null; - - new_kid_button.disabled = true; - save_group_button.disabled = true; - delete_group_button.disabled = true; - - var main_settings_fields = [ 'name', 'perm_interval', 'description' ]; - for ( var i in main_settings_fields ) { - var field = main_settings_fields[i]; - window["editor_pane_" + field].setValue( '' ); // unset the value - window["editor_pane_" + field].setDisplayedValue( '' ); // unset the value - } - - window["editor_pane_usergroup"].setChecked( false ); // unset the value - - highlighter.editor_pane.green.play(); - status_update( dojo.string.substitute( pgt_strings.STATUS_DELETED, [old_name]) ); - } else { - highlighter.editor_pane.red.play(); - status_update( dojo.string.substitute( pgt_strings.ERROR_DELETING, [old_name]) ); + var old_name = group_store.getValue( current_group, 'name' ); + + group_store.fetch({ + query : { id : group_store.getValue( current_group, 'id' ) }, + queryOptions : { deep : true }, + onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } }, + scope : group_store + }); + + current_group = null; + + new_kid_button.disabled = true; + save_group_button.disabled = true; + delete_group_button.disabled = true; + + var main_settings_fields = [ 'name', 'perm_interval', 'description' ]; + for ( var i in main_settings_fields ) { + var field = main_settings_fields[i]; + window["editor_pane_" + field].setValue( '' ); // unset the value + window["editor_pane_" + field].setDisplayedValue( '' ); // unset the value } + + window["editor_pane_usergroup"].setChecked( false ); // unset the value + + highlighter.editor_pane.green.play(); + status_update( dojo.string.substitute( pgt_strings.STATUS_DELETED, [old_name]) ); } - }).send(); + }); } ]]> @@ -464,30 +422,18 @@ }); var err = false; - server.pCRUD.request({ - method : 'open-ils.permacrud.create.pgt', - timeout : 10, - params : [ ses, new_fm_obj ], + + server.pcrud.create( new_fm_obj, { onerror : function (r) { highlighter.editor_pane.red.play(); status_update( pgt_strings.ERROR_CALLING_METHOD_PGT ); err = true; }, - oncomplete : function (r) { - var res = r.recv(); - if ( res && res.content() ) { - group_store.newItem( - res.content().toHash(), - { parent : current_group, attribute : 'children' } - ); - } else { - highlighter.editor_pane.red.play(); - status_update( pgt_strings.ERROR_CREATING_CHILD_GROUP ); - err = true; - } - }, - }).send(); - + oncomplete : function (r,list) { + group_store.newItem( list[0].toHash(), { parent : current_group, attribute : 'children' } ); + } + }); + if (!err) { highlighter.editor_pane.green.play(); highlighter.group_tree.green.play(); @@ -501,7 +447,7 @@

@@ -645,36 +591,26 @@ }); var err = false; - server.pCRUD.request({ - method : 'open-ils.permacrud.create.pgpm', - timeout : 10, - params : [ ses, new_fm_obj ], + server.pcrud.create(new_fm_obj, { onerror : function (r) { highlighter.group_tree.red.play(); status_update( pgt_strings.ERROR_CALLING_METHOD_PERM_MAP ); err = true; }, - oncomplete : function (r) { + oncomplete : function (r, list) { - var res = r.recv(); - if ( res && res.content() ) { - var new_item_hash = res.content().toHash(); - perm_map_store.newItem( new_item_hash ); - status_update( pgt_strings.SUCCESS_NEW_PERM_MAP ); - highlighter.group_tree.green.play(); + var new_item_hash = list[0].toHash(); + perm_map_store.newItem( new_item_hash ); + status_update( pgt_strings.SUCCESS_NEW_PERM_MAP ); + highlighter.group_tree.green.play(); - perm_map_model.query = { grp : current_group ? current_group.id[0] : -1 }; - perm_grid.model.sort(-1); - perm_map_model.refresh(); - perm_grid.refresh(); + perm_map_model.query = { grp : current_group ? group_store.getValue(current_group,'id') : -1 }; + perm_grid.model.sort(-1); + perm_map_model.refresh(); + perm_grid.refresh(); - } else { - highlighter.group_tree.red.play(); - status_update( pgt_strings.ERROR_CREATING_PERM_MAP ); - err = true; - } } - }).send(); + }); new_popup._closeDropDown(); ]]> @@ -708,34 +644,25 @@ var modified_pgpm = new pgpm().fromStoreItem( window.current_perm_map ); modified_pgpm.isdeleted( 1 ); - server.pCRUD.request({ - method : 'open-ils.permacrud.delete.pgpm', - timeout : 10, - params : [ ses, modified_pgpm ], + server.pcrud.eliminate( modified_pgpm, { onerror : function (r) { highlighter.editor_pane.red.play(); status_update( dojo.string.substitute( pgt_strings.ERROR_DELETING_PERM_MAPPING, [perm_map_store.getValue( window.current_perm_map, 'id' )] ) ); }, - oncomplete : function (r) { - var res = r.recv(); - if ( res && res.content() ) { + oncomplete : function (r, list) { - perm_map_store.fetch({ - query : { id : perm_map_store.getValue( window.current_perm_map, 'id' ) }, - onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } }, - scope : perm_map_store - }); + perm_map_store.fetch({ + query : { id : perm_map_store.getValue( window.current_perm_map, 'id' ) }, + onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } }, + scope : perm_map_store + }); - window.current_perm_map = null; + window.current_perm_map = null; - highlighter.editor_pane.green.play(); - status_update( pgt_strings.SUCCESS_DELETED_PERM_MAP ); - } else { - highlighter.editor_pane.red.play(); - status_update( dojo.string.substitute( pgt_strings.ERROR_DELETING_PERM_MAPPING, [perm_map_store.getValue( window.current_perm_map, 'id' )]) ); - } + highlighter.editor_pane.green.play(); + status_update( pgt_strings.SUCCESS_DELETED_PERM_MAP ); } - }).send(); + }); } ]]> diff --git a/Open-ILS/web/conify/global/permission/grp_tree.js b/Open-ILS/web/conify/global/permission/grp_tree.js index b56e1df044..bf6cc77b24 100644 --- a/Open-ILS/web/conify/global/permission/grp_tree.js +++ b/Open-ILS/web/conify/global/permission/grp_tree.js @@ -17,6 +17,7 @@ dojo.require('fieldmapper.AutoIDL'); dojo.require('fieldmapper.dojoData'); +dojo.require('openils.PermaCrud'); dojo.require('openils.widget.TranslatorPopup'); dojo.require('dojo.parser'); dojo.require('dojo.data.ItemFileWriteStore'); @@ -45,12 +46,11 @@ var cgi = new CGI(); var cookieManager = new HTTP.Cookies(); var ses = cookieManager.read('ses') || cgi.param('ses'); var server = {}; -server.pCRUD = new OpenSRF.ClientSession('open-ils.permacrud'); +server.pcrud = new openils.PermaCrud({ authtoken : ses }); server.actor = new OpenSRF.ClientSession('open-ils.actor'); var pgt_strings = dojo.i18n.getLocalization('openils.conify', 'conify'); -var current_group; var virgin_out_id = -1; var highlighter = {}; @@ -68,26 +68,17 @@ function save_group () { save_group_button.disabled = false; delete_group_button.disabled = false; - server.pCRUD.request({ - method : 'open-ils.permacrud.update.pgt', - timeout : 10, - params : [ ses, modified_pgt ], + server.pcrud.update(modified_pgt, { onerror : function (r) { highlighter.editor_pane.red.play(); status_update( dojo.string.substitute( pgt_strings.ERROR_SAVING_DATA, [group_store.getValue( current_group, 'name' )]) ); }, oncomplete : function (r) { - var res = r.recv(); - if ( res && res.content() ) { - group_store.setValue( current_group, 'ischanged', 0 ); - highlighter.editor_pane.green.play(); - status_update( dojo.string.substitute(pgt_strings.SUCCESS_SAVE, [group_store.getValue( current_group, 'name' )]) ); - } else { - highlighter.editor_pane.red.play(); - status_update( dojo.string.substitute(pgt_strings.ERROR_SAVING_DATA, [group_store.getValue( current_group, 'name' )]) ); - } + group_store.setValue( current_group, 'ischanged', 0 ); + highlighter.editor_pane.green.play(); + status_update( dojo.string.substitute(pgt_strings.SUCCESS_SAVE, [group_store.getValue( current_group, 'name' )]) ); }, - }).send(); + }); } function save_perm_map (storeItem) { @@ -95,26 +86,17 @@ function save_perm_map (storeItem) { var modified_pgpm = new pgpm().fromStoreItem( storeItem ); modified_pgpm.ischanged( 1 ); - server.pCRUD.request({ - method : 'open-ils.permacrud.update.pgpm', - timeout : 10, - params : [ ses, modified_pgpm ], + server.pcrud.update(modified_pgpm, { onerror : function (r) { highlighter.editor_pane.red.play(); status_update( dojo.string.substitute(pgt_strings.ERROR_SAVING_PERM_DATA, [group_store.getValue( current_group, 'name' )]) ); }, oncomplete : function (r) { - var res = r.recv(); - if ( res && res.content() ) { - perm_map_store.setValue( storeItem, 'ischanged', 0 ); - highlighter.editor_pane.green.play(); - status_update( dojo.string.substitute(pgt_strings.SUCCESS_SAVE_PERM, [group_store.getValue( current_group, 'name' )]) ); - } else { - highlighter.editor_pane.red.play(); - status_update( dojo.string.substitute(pgt_strings.ERROR_SAVING_PERM_DATA, [group_store.getValue( current_group, 'name' )]) ); - } + perm_map_store.setValue( storeItem, 'ischanged', 0 ); + highlighter.editor_pane.green.play(); + status_update( dojo.string.substitute(pgt_strings.SUCCESS_SAVE_PERM, [group_store.getValue( current_group, 'name' )]) ); }, - }).send(); + }); } function save_them_all (event) { diff --git a/Open-ILS/web/conify/global/permission/perm_list.html b/Open-ILS/web/conify/global/permission/perm_list.html index fad15ade02..480d7e5a0a 100644 --- a/Open-ILS/web/conify/global/permission/perm_list.html +++ b/Open-ILS/web/conify/global/permission/perm_list.html @@ -62,95 +62,87 @@ - - - - -

- - if (dirtyStore.length > 0) { - var confirmation = confirm(ppl_strings.CONFIRM_EXIT_PPL); - if (confirmation) { - for (var i in window.dirtyStore) { - window.current_perm = window.dirtyStore[i]; - save_perm(true); - } - } - } + - }); - } - }).send(); -]]> - + +

&conify.perm_list.new_permission.label;

@@ -166,42 +158,29 @@ }); var err = false; - pCRUD.request({ - method : 'open-ils.permacrud.create.ppl', - timeout : 10, - params : [ ses, new_fm_obj ], + pCRUD.create(new_fm_obj, { onerror : function (r) { highlighter.red.play(); status_update( ppl_strings.ERROR_CALLING_METHOD_PPL ); err = true; }, - oncomplete : function (r) { - var res = r.recv(); - if ( res && res.content() ) { - var new_item_hash = res.content().toHash(); - perm_store.newItem( new_item_hash ); - status_update( dojo.string.substitute(ppl_strings.SUCCESS_CREATING_PERMISSION, [new_item_hash.code]) ); - perm_grid.model.sort(-1); - highlighter.green.play(); - } else { - highlighter.red.play(); - status_update( ppl_strings.ERROR_CREATING_PERMISSION ); - err = true; - } + oncomplete : function (r, list) { + var new_item_hash = list[0].toHash(); + perm_store.newItem( new_item_hash ); + status_update( dojo.string.substitute(ppl_strings.SUCCESS_CREATING_PERMISSION, [new_item_hash.code]) ); + perm_grid.model.sort(-1); + highlighter.green.play(); } - }).send(); + }); ]]>

@@ -233,36 +212,26 @@ var modified_ppl = new ppl().fromStoreItem( current_perm ); modified_ppl.isdeleted( 1 ); - pCRUD.request({ - method : 'open-ils.permacrud.delete.ppl', - timeout : 10, - params : [ ses, modified_ppl ], + pCRUD.eliminate(modified_ppl, { onerror : function (r) { highlighter.red.play(); status_update( dojo.string.substitute(ppl_strings.ERROR_DELETING, [perm_store.getValue( current_perm, 'code' )]) ); }, oncomplete : function (r) { - var res = r.recv(); - if ( res && res.content() ) { - - var old_name = perm_store.getValue( current_perm, 'code' ); - - perm_store.fetch({ - query : { id : perm_store.getValue( current_perm, 'id' ) }, - onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } }, - scope : perm_store - }); - - current_perm = null; - - highlighter.green.play(); - status_update( dojo.string.substitute(ppl_strings.STATUS_DELETED, [old_name]) ); - } else { - highlighter.red.play(); - status_update( dojo.string.substitute(ppl_strings.ERROR_DELETING, [old_name]) ); - } + var old_name = perm_store.getValue( current_perm, 'code' ); + + perm_store.fetch({ + query : { id : perm_store.getValue( current_perm, 'id' ) }, + onItem : function (item, req) { try { if (this.isItem( item )) this.deleteItem( item ); } catch (e) { /* meh */ } }, + scope : perm_store + }); + + current_perm = null; + + highlighter.green.play(); + status_update( dojo.string.substitute(ppl_strings.STATUS_DELETED, [old_name]) ); } - }).send(); + }); } } @@ -273,5 +242,11 @@

+ + diff --git a/Open-ILS/web/conify/global/permission/perm_list.js b/Open-ILS/web/conify/global/permission/perm_list.js index ad845ca19d..18c8fce422 100644 --- a/Open-ILS/web/conify/global/permission/perm_list.js +++ b/Open-ILS/web/conify/global/permission/perm_list.js @@ -18,6 +18,7 @@ dojo.require('fieldmapper.AutoIDL'); dojo.require('fieldmapper.dojoData'); dojo.require('openils.widget.TranslatorPopup'); +dojo.require('openils.PermaCrud'); dojo.require('dojo.parser'); dojo.require('dojo.string'); dojo.require('dojo.data.ItemFileWriteStore'); @@ -36,7 +37,7 @@ dojo.requireLocalization("openils.conify", "conify"); var cgi = new CGI(); var cookieManager = new HTTP.Cookies(); var ses = cookieManager.read('ses') || cgi.param('ses'); -var pCRUD = new OpenSRF.ClientSession('open-ils.permacrud'); +var pCRUD = new openils.PermaCrud({authtoken : ses}); var ppl_strings = dojo.i18n.getLocalization('openils.conify', 'conify'); @@ -56,26 +57,17 @@ function save_perm () { modified_ppl.description( dojo.string.trim( modified_ppl.description() ) ); modified_ppl.code( dojo.string.trim( modified_ppl.code() ) ); - pCRUD.request({ - method : 'open-ils.permacrud.update.ppl', - timeout : 10, - params : [ ses, modified_ppl ], + pCRUD.update(modified_ppl, { onerror : function (r) { highlighter.red.play(); status_update( dojo.string.substitute(ppl_strings.ERROR_SAVING_DATA, [perm_store.getValue(current_perm, 'code')]) ); }, oncomplete : function (r) { - var res = r.recv(); - if ( res && res.content() ) { - perm_store.setValue( current_perm, 'ischanged', 0 ); - highlighter.green.play(); - status_update( dojo.string.substitute(ppl_strings.SUCCESS_SAVE, [perm_store.getValue(current_perm, 'code')]) ); - } else { - highlighter.red.play(); - status_update( dojo.string.substitute(ppl_strings.ERROR_SAVING_DATA, [perm_store.getValue(current_perm, 'code')]) ); - } - }, - }).send(); + perm_store.setValue( current_perm, 'ischanged', 0 ); + highlighter.green.play(); + status_update( dojo.string.substitute(ppl_strings.SUCCESS_SAVE, [perm_store.getValue(current_perm, 'code')]) ); + } + }); } function save_them_all (event) {