LP#1402797 Test value directly, and invert test for the a-disabled test

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/templates/staff/circ/share/t_hold_edit_pickup_lib.tt2 b/Open-ILS/src/templates/staff/circ/share/t_hold_edit_pickup_lib.tt2
index b70b9ce..513bfa1 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/share/t_hold_edit_pickup_lib.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_hold_edit_pickup_lib.tt2
@@ -10,7 +10,7 @@
     <div class="form-group">
       <div class="col-md-4">[% l('Select Library:') %]</div>
       <div class="col-md-8">
-        <eg-org-selector disable-test="can_be_pickup" selected="args.org_unit"></eg-org-selector>
+        <eg-org-selector disable-test="cant_be_pickup" selected="args.org_unit"></eg-org-selector>
       </div>
     </div>
   </div>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
index af255b2..e3e6206 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
@@ -198,7 +198,7 @@ function($modal , $q , egCore , egConfirmDialog , egAlertDialog) {
             controller : 
                 ['$scope', '$modalInstance',
                 function($scope, $modalInstance) {
-                    $scope.can_be_pickup = egCore.org.CanHaveUsers;
+                    $scope.cant_be_pickup = function (id) { return !egCore.org.CanHaveUsers(id); };
                     $scope.args = {};
                     $scope.ok = function() { 
                         var vals = hold_ids.map(function(hold_id) {

diff --git a/Open-ILS/web/js/ui/default/staff/services/org.js b/Open-ILS/web/js/ui/default/staff/services/org.js
index dd89d82..dcf1d52 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/services/org.js
+++ b/Open-ILS/web/js/ui/default/staff/services/org.js
@@ -43,18 +43,18 @@ function($q,  egEnv,  egAuth,  egNet) {
 
     // tests that a node can have users
     service.CanHaveUsers = function(node_or_id) {
-        return Boolean(service
+       return service
             .get(node_or_id)
             .ou_type()
-            .can_have_users());
+            .can_have_users() == 't';
     }
 
     // tests that a node can have volumes
     service.CanHaveVolumes = function(node_or_id) {
-        return Boolean(service
+        return service
             .get(node_or_id)
             .ou_type()
-            .can_have_vols());
+            .can_have_vols() == 't';
     }
 
     // list of org_unit objects  or IDs for me + descendants