From fbca755262f02def8ffc571c807e24d305fb44ab Mon Sep 17 00:00:00 2001 From: Luke Imhoff Date: Sat, 2 Aug 2014 00:53:59 -0500 Subject: [PATCH] Restore uniqueness validators MSP-10963 Since last commit proves validator changes are needed, restore the changes to prove the specs catch the error. --- app/models/metasploit/credential/core.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/metasploit/credential/core.rb b/app/models/metasploit/credential/core.rb index a9e88991..8f16ca6e 100644 --- a/app/models/metasploit/credential/core.rb +++ b/app/models/metasploit/credential/core.rb @@ -120,8 +120,8 @@ class Metasploit::Credential::Core < ActiveRecord::Base scope: [ :workspace_id, # realm_id and public_id need to be included in scope so validator uses IS NULL. - #:realm_id, - #:public_id + :realm_id, + :public_id ] }, if: '!realm.present? && !public.present? && private.present?' @@ -132,8 +132,8 @@ class Metasploit::Credential::Core < ActiveRecord::Base scope: [ :workspace_id, # realm_id and private_id need ot be included in scope so validator uses IS NULL. - #:realm_id, - #:private_id + :realm_id, + :private_id ] }, if: '!realm.present? && public.present? && !private.present?' @@ -144,7 +144,7 @@ class Metasploit::Credential::Core < ActiveRecord::Base scope: [ :workspace_id, # realm_id needs to be included in scope so validator uses IS NULL. - #:realm_id, + :realm_id, :public_id ] }, @@ -157,7 +157,7 @@ class Metasploit::Credential::Core < ActiveRecord::Base :workspace_id, :realm_id, # public_id needs to be included in scope so validator uses IS NULL. - #:public_id + :public_id ] }, if: 'realm.present? && !public.present? && private.present?' @@ -169,7 +169,7 @@ class Metasploit::Credential::Core < ActiveRecord::Base :workspace_id, :realm_id, # private_id needs to be included in scope so validator uses IS NULL. - #:private_id + :private_id ] }, if: 'realm.present? && public.present? && !private.present?'