From b3b69a3cecf5ae310703a5cbc869bf7e75d34dea Mon Sep 17 00:00:00 2001 From: Mahathi Karnam Date: Mon, 8 Sep 2014 17:24:47 +0530 Subject: [PATCH 1/3] disabling tenant scope upon a flag --- lib/multitenancy/model_extensions.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 238c402832c183e65611034fc0ba4871b4f3a5b3 Mon Sep 17 00:00:00 2001 From: Mahathi Karnam Date: Fri, 12 Sep 2014 19:37:18 +0530 Subject: [PATCH 2/3] changed version to 0.0.5.patched --- lib/multitenancy/version.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/multitenancy/version.rb b/lib/multitenancy/version.rb index fb06a73..bc50076 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.5.patched" end From 11081f52aeb950ee6e698e4f814a30896ff74152 Mon Sep 17 00:00:00 2001 From: Mahathi Karnam Date: Fri, 12 Sep 2014 20:26:57 +0530 Subject: [PATCH 3/3] changed version to 0.0.6.patched --- lib/multitenancy/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/multitenancy/version.rb b/lib/multitenancy/version.rb index bc50076..e382a1a 100644 --- a/lib/multitenancy/version.rb +++ b/lib/multitenancy/version.rb @@ -1,4 +1,4 @@ module Multitenancy # 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.5.patched" + VERSION = "0.0.6.patched" end