diff options
| author | Azul <azul@riseup.net> | 2016-03-31 11:40:44 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2016-03-31 11:40:44 +0200 |
| commit | be5efb57dc9b282a31cf29c9eac27cb5a7e7ac2f (patch) | |
| tree | ce8bee7d2fa4007a1db9815e1af001fe44e329c1 /app/models/account.rb | |
| parent | 14c9f2ab7cbf410bcd7fdd75b4a1c11417b30bd7 (diff) | |
| parent | 48acca107b9bd7a59bacb1449b042eb753e63917 (diff) | |
Merge remote-tracking branch 'github/211' into develop
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index abde89d..a85e56c 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -21,7 +21,7 @@ class Account user = User.new(attrs) user.save - if !user.tmp? && user.persisted? + if !user.is_tmp? && user.persisted? identity = user.identity identity.user_id = user.id identity.save @@ -59,7 +59,7 @@ class Account def destroy(destroy_identity=false) return unless @user - if !@user.tmp? + if !@user.is_tmp? if destroy_identity == false @user.identities.each do |id| id.orphan! @@ -77,7 +77,7 @@ class Account # in place, but the user should not be able to send email or # create new authentication certificates. def disable - if @user && !@user.tmp? + if @user && !@user.is_tmp? @user.enabled = false @user.save @user.identities.each do |id| @@ -119,7 +119,7 @@ class Account def self.creation_problem?(user, identity) return true if user.nil? || !user.persisted? || user.errors.any? - if !user.tmp? + if !user.is_tmp? return true if identity.nil? || !identity.persisted? || identity.errors.any? end return false |