From: Bill Erickson Date: Wed, 29 Oct 2014 21:10:41 +0000 (-0400) Subject: KMAIN-1400: Call Number Reverting Changed code in update_items.js to ensure that... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e8948d7e7d6eeac89c06392dff4e9e09d1ac1fbd;p=working%2FEvergreen.git KMAIN-1400: Call Number Reverting Changed code in update_items.js to ensure that all call number changes are being applied and saved correctly. The Print Labels screen now displays the correct labels. Cross-port: efaad27 --- diff --git a/Open-ILS/xul/staff_client/server/cat/update_items.js b/Open-ILS/xul/staff_client/server/cat/update_items.js index 3332d7fff8..998c350c0f 100644 --- a/Open-ILS/xul/staff_client/server/cat/update_items.js +++ b/Open-ILS/xul/staff_client/server/cat/update_items.js @@ -17,7 +17,6 @@ g.acpl_list = []; // This file was modeled off of volume_copy_creator.js, so if you need // functionality back, take it from there function my_init() { - try { /* Initial setup */ @@ -62,11 +61,10 @@ function my_init() { if (g.lineitem_list[0].length == 0){ - alert('TCN '+xul_param('doc_id')+" doesn't appear to have any open lineitems..."); + alert('TCN '+xul_param('doc_id')+"doesn't appear to have any open lineitems... "); } else{ - //copyTemplatecopyTemplate.push("owning_lib"); g.current_lineitem_index = 0; // This keeps track of which lineitem we're on @@ -240,11 +238,9 @@ g.load_and_render_lineitem_notes = function(lineitem_id) { } g.load_lineitem = function(raw_lineitem_data){ - var raw_data = raw_lineitem_data[0][1]; var copyTemplate = raw_lineitem_data[1].acp; var volumeTemplate = raw_lineitem_data[1].acn; - var volTemplate = []; for (var i in volumeTemplate){ @@ -473,7 +469,6 @@ g.load_lineitem = function(raw_lineitem_data){ */ g.render_loaded_lineitem = function(){ - var rows = document.getElementById('rows'); // For every library @@ -521,7 +516,6 @@ g.render_loaded_lineitem = function(){ // Draw each volume for (var volume_id in g.org_label_existing_copy_map[g.ou_ids[i]]) { - // this draws a volume g.render_callnumber_copy_count_entry(rows,row,g.ou_ids[i],isFirst, volume_id); @@ -633,7 +627,6 @@ g.render_callnumber_copy_count_entry = function(rows,row,ou_id,isFirst,vol_id){ rows.appendChild(r); for (var i = 0; i < 2; i++){ - var spacer = document.createElement('vbox'); r.appendChild(spacer); } @@ -642,7 +635,6 @@ g.render_callnumber_copy_count_entry = function(rows,row,ou_id,isFirst,vol_id){ /**** CALLNUMBER COLUMN ****/ var call_number_node = document.createElement('vbox'); r.appendChild(call_number_node); - call_number_node.width = $('marc_cn').parentNode.boxObject.width; var call_number_textbox = document.createElement('textbox'); call_number_node.appendChild(call_number_textbox); @@ -650,12 +642,10 @@ g.render_callnumber_copy_count_entry = function(rows,row,ou_id,isFirst,vol_id){ call_number_textbox.setAttribute('rel_vert_pos',rel_vert_pos_call_number); call_number_textbox.setAttribute('ou_id',ou_id); call_number_textbox.setAttribute('acn_id',vol_id); - call_number_textbox.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false ); // First set the label var copy_call_number = g.org_label_existing_copy_map[ou_id][vol_id][0].a[3].a[7]; - call_number_textbox.value = copy_call_number.trim(); /**** NUMBER OF COPIES COLUMN ****/ @@ -721,8 +711,6 @@ g.render_callnumber_copy_count_entry = function(rows,row,ou_id,isFirst,vol_id){ row ); -//number_of_copies_textbox.setAttribute('size','1'); number_of_copies_textbox.setAttribute('cols','1'); //added here - } catch(E) { alert(E+": 762 - "+JSON.stringify(number_of_copies_textbox)); } @@ -950,8 +938,7 @@ g.gather_copies = function() { // If there's a new label, update it and mark volume as 'changed' if (g.map_acn[acn_id].label() != callnumber){ - - g.map_acn[acn_id].label(callnumber); + g.map_acn[acn_id].label(callnumber); g.map_acn[acn_id].ischanged(get_db_true()); } } @@ -998,13 +985,11 @@ g.gather_copies = function() { if (copies[i].id() in copy_map){ if (copies[i].barcode() != copy_map[copies[i].id()].barcode){ - copies[i].barcode(copy_map[copies[i].id()].barcode); copies[i].a[45] = get_db_true(); // setting ischanged to true } if (copies[i].call_number() != copy_map[copies[i].id()].acn_id){ - copies[i].call_number(copy_map[copies[i].id()].acn_id); copies[i].a[45] = get_db_true(); // setting ischanged to true } @@ -1143,7 +1128,6 @@ g.stash_and_close = function(param, keepOpen) { if (copies_to_check[i].id() == copies[c].id()){ copies[c].call_number( copies_to_check[i].call_number() ); - break; } } @@ -1218,7 +1202,6 @@ g.stash_and_close = function(param, keepOpen) { var worksheet_tab_name = $("catStrings").getString('staff.cat.util.print_worksheet.tab_name') + g.lineitem_list[g.current_lineitem_index][0]; label_editor_func = function() { - xulG.set_tab( urls.XUL_SPINE_LABEL, { 'tab_name' : tab_name }, @@ -1462,24 +1445,21 @@ g.render_batch_button = function() { function() { var nl = document.getElementsByTagName('textbox'); - var label = $('marc_cn').firstChild.value; - if (label != '') { + var label = $('marc_cn').firstChild.value; + if (label != '') { for (var i = 0; i < nl.length; i++) { /* label */ - if (nl[i].getAttribute('rel_vert_pos')==rel_vert_pos_call_number && !nl[i].disabled) { - - nl[i].value = label; + if (nl[i].getAttribute('rel_vert_pos')==rel_vert_pos_call_number && !nl[i].disabled) { + nl[i].value = label; } } for (var i in g.map_acn){ - - if (g.map_acn[i].label() != label){ - - g.map_acn[i].label(label); - g.map_acn[acn_id].ischanged(get_db_true()); - } - } + if (g.map_acn[i].label() != label){ + g.map_acn[i].label(label); + g.map_acn[i].ischanged(get_db_true()); + } + } } if (g.last_focus){