diff --git a/lib/multitenancy/model_extensions.rb b/lib/multitenancy/model_extensions.rb index 38b7553..fa6ea44 100644 --- a/lib/multitenancy/model_extensions.rb +++ b/lib/multitenancy/model_extensions.rb @@ -9,7 +9,7 @@ module ModelExtensions module ClassMethods - def acts_as_tenant(tenant_id, sub_tenant_id=nil) + def acts_as_tenant(tenant_id, sub_tenant_id=nil, disable_tenant_scope = false) raise "tenant_id can't be nil! [Multitenancy]" unless tenant_id def self.is_scoped_by_tenant? @@ -32,7 +32,7 @@ def self.is_scoped_by_tenant? tenant = Multitenancy.current_tenant if tenant && tenant.tenant_id conditions = {} - conditions[tenant_id] = tenant.tenant_id + conditions[tenant_id] = tenant.tenant_id unless disable_tenant_scope conditions[sub_tenant_id] = tenant.sub_tenant_id if sub_tenant_id && tenant.sub_tenant_id where(conditions) end diff --git a/lib/multitenancy/version.rb b/lib/multitenancy/version.rb index fb06a73..e382a1a 100644 --- a/lib/multitenancy/version.rb +++ b/lib/multitenancy/version.rb @@ -1,3 +1,4 @@ module Multitenancy - VERSION = "0.0.5" + # This is a patched version built out of branch disabling_tenant to avoid searching entities with tenant_id(while making select queries) + VERSION = "0.0.6.patched" end