[open-ils-commits] [GIT] Evergreen ILS branch rel_2_0 updated. 01ceacd2fd1d01df184567ce73c8b0357fcb720f

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_0 has been updated
       via  01ceacd2fd1d01df184567ce73c8b0357fcb720f (commit)
      from  2649a8e191e3dd1d88c4758a22cd1582ed86625d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 01ceacd2fd1d01df184567ce73c8b0357fcb720f
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Thu Jul 21 15:25:28 2011 -0400

    lp#792595: Don't allow pre-cats into record buckets via Item Status -> Actions for Catalogers
    
    Alerts with the number of pre-cat records skipped prior to invoking the title bucket dialog.
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>

diff --git a/Open-ILS/xul/staff_client/server/cat/util.js b/Open-ILS/xul/staff_client/server/cat/util.js
index 2c8a5cc..7f7949a 100644
--- a/Open-ILS/xul/staff_client/server/cat/util.js
+++ b/Open-ILS/xul/staff_client/server/cat/util.js
@@ -266,14 +266,29 @@ cat.util.add_copies_to_bucket = function(selection_list) {
 
 cat.util.add_titles_to_bucket = function(record_ids) {
     JSAN.use('util.window'); var win = new util.window();
-    win.open(
-        xulG.url_prefix(urls.XUL_RECORD_BUCKETS_QUICK),
-        'sel_bucket_win' + win.window_name_increment(),
-        'chrome,resizable,modal,center',
-        {
-            record_ids: record_ids 
+    JSAN.use('util.functional');
+    var filtered_record_ids = util.functional.filter_list(
+        record_ids,
+        function(o) {
+            return o != -1; // don't allow the magic pre-cat bib
         }
     );
+    if (filtered_record_ids.length != record_ids.length) {
+        alert($("catStrings").getFormattedString(
+            'staff.cat.util.add_titles_to_bucket.number_of_precats_skipped',
+            [ record_ids.length - filtered_record_ids.length ]
+        ));
+    }
+    if (filtered_record_ids.length > 0) {
+        win.open(
+            xulG.url_prefix(urls.XUL_RECORD_BUCKETS_QUICK),
+            '_blank',
+            'chrome,resizable,modal,center',
+            {
+                record_ids: filtered_record_ids
+            }
+        );
+    }
 }
 
 cat.util.spawn_copy_editor = function(params) {
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 ddf3366..568f0fd 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
@@ -397,6 +397,7 @@ staff.cat.util.mark_item_missing_pieces.marking_error=Error marking item %1$s as
 staff.cat.util.mark_item_missing_pieces.one_item_missing_pieces=Item marked as missing pieces.
 staff.cat.util.mark_item_missing_pieces.multiple_item_missing_pieces=%1$s items marked as missing pieces.
 staff.cat.util.mark_item_missing_pieces.circ_not_found=No circulation found for item with barcode %1$s.  Item left unmodified.
+staff.cat.util.add_titles_to_bucket.number_of_precats_skipped=Skipping %1$s pre-cat records...
 
 staff.cat.volume_buckets.window_tab_name=Volume Buckets
 staff.cat.volume_copy_creator.my_init.btn.label=Apply

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/xul/staff_client/server/cat/util.js       |   27 +++++++++++++++----
 .../server/locale/en-US/cat.properties             |    1 +
 2 files changed, 22 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Evergreen ILS