From 09dfa583eca69a3925c384c67c3d98cd8c69b360 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Wed, 28 May 2014 12:28:07 +0200
Subject: allow changing the user_id on an identity

we set it to nil when we disable it
---
 app/models/identity.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/models/identity.rb b/app/models/identity.rb
index 0d25bae..a8eaba6 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -130,7 +130,7 @@ class Identity < CouchRest::Model::Base
 
   def alias_available
     same_address = Identity.by_address.key(address)
-    if same_address.detect { |other| other.user != self.user }
+    if same_address.detect { |other| other != self && other.user != self.user }
       errors.add :address, :taken
     end
   end
-- 
cgit v1.2.3