From 3338b1e0f852ffc7fa587071bdec1e0e17288f4a Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Tue, 12 Mar 2013 16:08:43 -0400 Subject: [PATCH] Revert "Allow inactive patron barcode to be loaded" - going to wait until upgrade script. This reverts commit 8618e6a17b87da39c87c31c37d30298fc868af39. --- Open-ILS/src/sql/Pg/020.schema.functions.sql | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Open-ILS/src/sql/Pg/020.schema.functions.sql b/Open-ILS/src/sql/Pg/020.schema.functions.sql index 5ac7eeec2c..f69bfa4aa0 100644 --- a/Open-ILS/src/sql/Pg/020.schema.functions.sql +++ b/Open-ILS/src/sql/Pg/020.schema.functions.sql @@ -359,8 +359,7 @@ BEGIN RETURN QUERY SELECT 'booking'::TEXT, id::BIGINT, barcode FROM booking.resource WHERE barcode = ANY(asset_barcodes); END IF; IF do_actor THEN - RETURN QUERY SELECT 'actor'::TEXT, c.usr::BIGINT, c.barcode FROM actor.card c JOIN actor.usr u ON c.usr = u.id WHERE - ((c.barcode = ANY(actor_barcodes) AND c.active) OR c.barcode = in_barcode) AND NOT u.deleted ORDER BY usr; + RETURN QUERY SELECT 'actor'::TEXT, c.usr::BIGINT, c.barcode FROM actor.card c JOIN actor.usr u ON c.usr = u.id WHERE c.barcode = ANY(actor_barcodes) AND c.active AND NOT u.deleted ORDER BY usr; END IF; RETURN; END; -- 2.11.0