Further cleanup of location checks; remove "no" option from at_circ and at_owning

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
index 75fcbd8..6fa6d5b 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
@@ -763,9 +763,9 @@ sub generate_system_copy_alerts {
             my $orgs = $U->get_org_descendants($copy_circ_lib);
 
             if ($U->is_true($a->invert_location)) {
-                next if (grep {$_ == $copy_circ_lib} @$orgs);
+                next if (grep {$_ == $self->circ_lib} @$orgs);
             } else {
-                next unless (grep {$_ == $copy_circ_lib} @$orgs);
+                next unless (grep {$_ == $self->circ_lib} @$orgs);
             }
         }
 
@@ -776,9 +776,9 @@ sub generate_system_copy_alerts {
             my $orgs = $U->get_org_descendants($copy_owning_lib);
 
             if ($U->is_true($a->invert_location)) {
-                next if (grep {$_ == $copy_owning_lib} @$orgs);
+                next if (grep {$_ == $self->circ_lib} @$orgs);
             } else {
-                next unless (grep {$_ == $copy_owning_lib} @$orgs);
+                next unless (grep {$_ == $self->circ_lib} @$orgs);
             }
         }
 

diff --git a/Open-ILS/src/templates/staff/admin/local/autoGridEditor/ccat.tt2 b/Open-ILS/src/templates/staff/admin/local/autoGridEditor/ccat.tt2
index a5e35a1..4ee77de 100644 (file)
--- a/Open-ILS/src/templates/staff/admin/local/autoGridEditor/ccat.tt2
+++ b/Open-ILS/src/templates/staff/admin/local/autoGridEditor/ccat.tt2
@@ -69,7 +69,6 @@
         <select id="at-circ-selector" class="form-control" ng-model="record.at_circ">
             <option value="">[% l('Do not care') %]</option>
             <option value="t">[% l('Yes') %]</option>
-            <option value="f">[% l('No') %]</option>
         </select>
       </div>
       <div class="form-group">
@@ -77,7 +76,6 @@
         <select id="at-owning-selector" class="form-control" ng-model="record.at_owning">
             <option value="">[% l('Do not care') %]</option>
             <option value="t">[% l('Yes') %]</option>
-            <option value="f">[% l('No') %]</option>
         </select>
       </div>
     </div>