Download as
Browse Code »

Commit e2b6c2fa21cad61340d7f0fae69f92c416c1ecd3

Authored by Braulio Bhavamitra
1 parent 0146694f
Exists in master and in 21 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, theme-brasil-digital-from-staging, travis

profile: Accept nil on short_name

Showing 1 changed file with 5 additions and 1 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @e2b6c2f
@@ -741,7 +741,11 @@ private :generate_url, :url_options @@ -741,7 +741,11 @@ private :generate_url, :url_options
741 include ActionView::Helpers::TextHelper 741 include ActionView::Helpers::TextHelper
742 def short_name(chars = 40) 742 def short_name(chars = 40)
743 if self[:nickname].blank? 743 if self[:nickname].blank?
744 - truncate self.name, :length => chars, :omission => '...' 744 + if chars
  745 + truncate self.name, :length => chars, :omission => '...'
  746 + else
  747 + self.name
  748 + end
745 else 749 else
746 self[:nickname] 750 self[:nickname]
747 end 751 end