From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 29 Oct 2014 21:10:30 +0000 (-0400)
Subject: added a boolean check to g.stash_and_close in update_items.js, added the boolean... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0611ae03fe6a16a98484f80e4a81e85aab4ff14b;p=working%2FEvergreen.git

added a boolean check to g.stash_and_close in update_items.js, added the boolean to be passed by the save button, and added some localization to cat.properties

    Cross-port: 1c2cd32
---

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 dc11233e2a..585077d9f4 100644
--- a/Open-ILS/xul/staff_client/server/cat/update_items.js
+++ b/Open-ILS/xul/staff_client/server/cat/update_items.js
@@ -380,6 +380,7 @@ g.load_lineitem = function(raw_lineitem_data){
 
         g.set_attr('EditThenCreate','label','staff.cat.update_items.edit_then_rebarcode.btn.label');
         g.set_attr('EditThenCreate','accesskey','staff.cat.volume_copy_creator.edit_then_rebarcode.btn.accesskey');
+        g.set_attr('CreateWithDefaultsNoClose','label','staff.cat.volume_copy_creator.rebarcodenoclose.btn.label');
         g.set_attr('CreateWithDefaults','label','staff.cat.volume_copy_creator.rebarcode.btn.label');
         g.set_attr('CreateWithDefaults','accesskey','staff.cat.volume_copy_creator.rebarcode.btn.accesskey');
         g.set_attr('Create','label','staff.cat.volume_copy_creator.rebarcode.btn.label');
@@ -1063,7 +1064,7 @@ g.gather_copies = function() {
     }
 }
 
-g.stash_and_close = function(param) {
+g.stash_and_close = function(param, keepopen) {
 
     oils_unlock_page();
 
@@ -1126,6 +1127,9 @@ g.stash_and_close = function(param) {
         }
 
         var dont_close = false;
+        if (keepopen == true){
+            dont_close = true;
+        }
 
         var label_editor_func;
 
diff --git a/Open-ILS/xul/staff_client/server/cat/update_items.xul b/Open-ILS/xul/staff_client/server/cat/update_items.xul
index 3646d2481b..f5af9e778e 100644
--- a/Open-ILS/xul/staff_client/server/cat/update_items.xul
+++ b/Open-ILS/xul/staff_client/server/cat/update_items.xul
@@ -69,6 +69,10 @@
 							<label class="header" value="Lineitem"/>
 							<hbox id="lineitem_menulist"/>
 						</vbox>
+                        <vbox>
+							<label class="header" value="&staff.cat.volume_copy_creator.refresh_bar;"/>
+							<hbox id="refresh_button_box"/>
+						</vbox>
                     </row>
                 </rows>
             </grid>
@@ -144,6 +148,7 @@
             </hbox>
             <spacer flex="1"/>
             <hbox id="non_unified_buttons">
+                <button id="CreateWithDefaultsNoClose" oncommand="g.stash_and_close('noedit', true);"/>
                 <button id="CreateWithDefaults" oncommand="g.stash_and_close('noedit');"/>
                 <button id="EditThenCreate" oncommand="g.stash_and_close('edit');"/>
             </hbox>
diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties b/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
index ded820997f..bb3e9c685c 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
@@ -430,7 +430,8 @@ staff.cat.volume_copy_creator.create.btn.accesskey=C
 staff.cat.volume_copy_creator.edit_then_rebarcode.btn.label=Edit then Re-barcode
 staff.cat.update_items.edit_then_rebarcode.btn.label=Edit Item Attributes
 staff.cat.volume_copy_creator.edit_then_rebarcode.btn.accesskey=E
-staff.cat.volume_copy_creator.rebarcode.btn.label=Save
+staff.cat.volume_copy_creator.rebarcodenoclose.btn.label=Save
+staff.cat.volume_copy_creator.rebarcode.btn.label=Save And Close
 staff.cat.volume_copy_creator.rebarcode.btn.accesskey=S
 staff.cat.volume_copy_creator.render_volume_count_entry.message=You may not add more than %1$s items at a time for a given volume in this interface.
 staff.cat.volume_copy_creator.render_volume_count_entry.title=Maximum items exceeded.