Limit unfiltered holds list to ws_ou library system pickup locations.…

… Also increase hold list size limit.
grpl-eg · Aug 30, 2011 · 4fa40b2 · 4fa40b2
1 parent 82016cc
commit 4fa40b2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/lib/Application/Circ/Holds.pm b/lib/Application/Circ/Holds.pm
@@ -2777,6 +2777,19 @@ sub all_rec_holds {
     $args->{fulfillment_time} = undef; #  we don't want to see old fulfilled holds
 	$args->{cancel_time} = undef;
 
+# MIEG: limit the record hold list to individual library systems
+    if ($args->{pickup_lib} =~ /a$/) {
+	chop $args->{pickup_lib};
+        CASE: {
+                $_ = $args->{pickup_lib} || '';
+                /[3..8]/  and do  { $args->{pickup_lib} = { between => [2,8]   }; last CASE; };
+                /[10..17]/ and do  { $args->{pickup_lib} = { between => [10,17] }; last CASE; };
+                /[23..28]/ and do  { $args->{pickup_lib} = { between => [23,28] }; last CASE; };
+                /[31..33]/   and do  { $args->{pickup_lib} = { between => [31,33] }; last CASE; };
+        }
+    }
+
+
 	my $resp = { volume_holds => [], copy_holds => [], metarecord_holds => [], part_holds => [], issuance_holds => [] };
 
     my $mr_map = $e->search_metabib_metarecord_source_map({source => $title_id})->[0];

diff --git a/web/xul/rel_2_1/server/admin/hold_pull_list.js b/web/xul/rel_2_1/server/admin/hold_pull_list.js
@@ -5,7 +5,7 @@ var FETCH_USER                    = 'open-ils.actor:open-ils.actor.user.fleshed.
 var FETCH_VOLUME                = 'open-ils.search:open-ils.search.callnumber.retrieve';
 
 var myPerms                = [ 'VIEW_HOLD' ];
-var HOLD_LIST_LIMIT    = 100;
+var HOLD_LIST_LIMIT    = 1000;
 var numHolds            = 0;
 
 var listOffset            = 0;

diff --git a/web/xul/rel_2_1/server/patron/holds.js b/web/xul/rel_2_1/server/patron/holds.js
@@ -425,7 +425,7 @@ patron.holds.prototype = {
                                         ];
                                     }
                                 );
-                                ml = util.widgets.make_menulist( list, obj.data.list.au[0].ws_ou() );
+                                ml = util.widgets.make_menulist( list, obj.data.list.au[0].ws_ou(), 1 );
                                 ml.setAttribute('id','selection');
                                 ml.setAttribute('name','fancy_data');
                                 var xml = '<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1" style="overflow: vertical">';
@@ -1467,7 +1467,12 @@ patron.holds.prototype = {
                                 x[ x_lib_type_menu.value ] = obj.controller.view.lib_menu.value;
                                 params.push( x );
                             }
-                        }
+                        }else{
+//MIEG: limit pickup locations displayed. This requires CASE statement in Holds.pm to work correctly
+ 	                            var x = {};
+ 	                            x[ 'pickup_lib' ] = obj.data.list.au[0].ws_ou()+'a';
+ 	                            params.push( x );
+			}
                     }
                     obj.controller.view.cmd_retrieve_patron.setAttribute('hidden','false');
                 break;
@@ -1599,7 +1604,7 @@ patron.holds.prototype = {
             var file = new util.file('offline_ou_list');
             if (file._file.exists()) {
                 var list_data = file.get_object(); file.close();
-                var ml = util.widgets.make_menulist( list_data[0], obj.data.list.au[0].ws_ou() );
+                var ml = util.widgets.make_menulist( list_data[0], obj.data.list.au[0].ws_ou(), 1 );
                 ml.setAttribute('id','lib_menu');
                 x.appendChild( ml );
                 ml.addEventListener(