[open-ils-commits] [GIT] Evergreen ILS branch master updated. c76944d2a3703f04e3847c3bbde9a66ecfb1c6ce

[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, master has been updated
       via  c76944d2a3703f04e3847c3bbde9a66ecfb1c6ce (commit)
      from  41358314b81a6d238f5433da70963aaed00a70f5 (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 c76944d2a3703f04e3847c3bbde9a66ecfb1c6ce
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>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/xul/staff_client/server/cat/util.js b/Open-ILS/xul/staff_client/server/cat/util.js
index 98a6dd4..70149f9 100644
--- a/Open-ILS/xul/staff_client/server/cat/util.js
+++ b/Open-ILS/xul/staff_client/server/cat/util.js
@@ -300,14 +300,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),
-        '_blank',
-        '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 7bf9f65..79807a5 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
@@ -406,6 +406,7 @@ staff.cat.util.mark_item_missing_pieces.one_item_missing_pieces=Item marked as m
 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.show_in_opac.retrieving_title=Retrieving title...
+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