From d33adcbfd31ce7d4ba94cfe17b253b5ec34d29c3 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 1 May 2013 19:48:01 +0200
Subject: [PATCH] simplify conditions for holder with new rails 3 syntax
---
.../castle_gates/lib/castle_gates/key.rb | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/vendor/crabgrass_plugins/castle_gates/lib/castle_gates/key.rb b/vendor/crabgrass_plugins/castle_gates/lib/castle_gates/key.rb
index 49339012f..d6e844408 100644
--- a/vendor/crabgrass_plugins/castle_gates/lib/castle_gates/key.rb
+++ b/vendor/crabgrass_plugins/castle_gates/lib/castle_gates/key.rb
@@ -103,23 +103,11 @@ module CastleGates
end
def self.conditions_for_holder(holder)
- conditions_for_holder_codes(holder.all_codes)
+ { "castle_gates_keys.holder_code" => holder.all_codes }
end
private
- def self.conditions_for_holder_codes(codes)
- if codes.length == 1
- if codes.first.present?
- ["keys.holder_code = ?", codes.first]
- else
- "keys.holder_code IS NULL"
- end
- else
- ["keys.holder_code IN (?)", codes]
- end
- end
-
#
# Returns the bitmask for a set of gate names.
#
--
GitLab