Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

fallback for when nick is nil

Browse source
This commit is contained in:
wvengen 2013-10-29 18:58:04 +01:00
parent e968919cce
commit 9ba425aafa
6 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/user.rb
View file

@ -161,8 +161,12 @@ class User < ActiveRecord::Base
# XXX this is view-related; need to move out things like token_attributes
# then this can be removed
def display
# would be sensible to match ApplicationController#show_user
FoodsoftConfig[:use_nick] ? nick : name
# would be sensible to match ApplicationHelper#show_user
if FoodsoftConfig[:use_nick]
nick.nil? ? I18n.t('helpers.application.nick_fallback') : nick
else
name
end
end
def token_attributes