consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds User.is_organization and User.organization_name

Browse Source
This commit is contained in:
kikito
2015-08-14 20:24:19 +02:00
parent 4e5d53f2f1
commit 60a1cc2267
2 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/models/user.rb
View File

@@ -4,9 +4,10 @@ class User < ActiveRecord::Base
acts_as_voter
validates :first_name, presence: true, if: :use_first_name?
validates :last_name, presence: true, if: :use_last_name?
validates :nickname, presence: true, if: :use_nickname?
validates :first_name, presence: true, if: :use_first_name?
validates :last_name, presence: true, if: :use_last_name?
validates :nickname, presence: true, if: :use_nickname?
validates :organization_name, presence: true, if: :is_organization
has_one :administrator
has_one :moderator
@@ -16,6 +17,11 @@ class User < ActiveRecord::Base
scope :moderators, -> { joins(:moderator) }
scope :organizations, -> { joins(:organization) }
attr_accessor :organization_name
attr_accessor :is_organization
after_save :create_associated_organization
def name
return nickname if use_nickname?
return organization.name if organization?
@@ -44,11 +50,15 @@ class User < ActiveRecord::Base
private
def use_first_name?
!use_nickname? && !organization?
!is_organization && !use_nickname?
end
def use_last_name?
use_first_name?
end
def create_associated_organization
create_organization(name: organization_name) if is_organization
end
end