From c93be31121e6e20b14bced6b7354dd33273cb1ad Mon Sep 17 00:00:00 2001 From: Nicolae Claudius Date: Sat, 28 Jan 2012 05:18:35 -0800 Subject: [PATCH] fix when name blank --- app/models/user.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index d7f56c6..dd37954 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -24,6 +24,10 @@ class User < ActiveRecord::Base has_many :permitted_domains, :through => :permissions, :source => :domain def name + full_name.blank? ? email : full_name + end + + def full_name "#{first_name} #{last_name}" end