From 7077138c8aefa0bca5fa4dc4a0e6cc497f8c380a Mon Sep 17 00:00:00 2001 From: Joseph Lewis Date: Mon, 25 Jun 2012 10:03:36 -0600 Subject: [PATCH] Fixed perm_list so it actually hides deleted rows. Signed-off-by: Joseph Lewis --- Open-ILS/web/conify/global/permission/perm_list.js | 42 ++++++++++------------ 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/Open-ILS/web/conify/global/permission/perm_list.js b/Open-ILS/web/conify/global/permission/perm_list.js index 65e486a027..bac17c8925 100644 --- a/Open-ILS/web/conify/global/permission/perm_list.js +++ b/Open-ILS/web/conify/global/permission/perm_list.js @@ -136,10 +136,19 @@ var perm_grid_layout = [ { name : ppl_strings.LABEL_TRANSLATION, width : "10em", height : "2em", - formatter : function (value) { - return ''; - }, + formatter : function (value, row) { + + var r = perm_grid.getItem(row); + if (r) { + perm_rows[row] = new ccs().fromHash(r); + } + var pop = new openils.widget.TranslatorPopup({field:"description", targetObject:"window.perm_rows["+row+"]"}); + pop._destroyOnRemove = true; + return pop; + //return ''; + }/**, get : function (row) { + console.log("row",row); var r = perm_grid.getItem(row); if (r) { perm_rows[row] = new ccs().fromHash(r); @@ -155,7 +164,7 @@ var perm_grid_layout = [ return row; } return ''; - } + }**/ } ] ] @@ -211,20 +220,19 @@ var new_code = new_perm_code.getValue(); } }); } - + function delete_them() { var selected_rows = perm_grid.selection.getSelected(); - var selected_items = []; - perm_grid.selection.clear(); + perm_grid.removeSelectedRows(); for (var i in selected_rows) { - current_perm = selected_rows[i]; + const current_perm = selected_rows[i]; - if ( confirm( dojo.string.substitute(ppl_strings.CONFIRM_DELETE, [perm_store.getValue(current_perm, 'code')]) ) ) { + if ( confirm( dojo.string.substitute(ppl_strings.CONFIRM_DELETE, [current_perm['code']]) ) ) { - perm_store.setValue( current_perm, 'isdeleted', 1 ); + current_perm['isdeleted'] = 1; var modified_ppl = new ppl().fromStoreItem( current_perm ); modified_ppl.isdeleted( 1 ); @@ -232,25 +240,13 @@ function delete_them() 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' )]) ); + status_update( dojo.string.substitute(ppl_strings.ERROR_DELETING, [current_perm['code']]) ); }, oncomplete : function (r) { - 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]) ); } }); } } } - -- 2.11.0