Download as
Browse Code »

Commit 7564195bacfaebfeaf221401f6aab07ffaf335ba

Authored by Braulio Bhavamitra
2 parents b84467b5 2d4236dc
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'display-name-as-short-name' into 'master' 

organizations: use display_name on short_name

See merge request !554
Showing 1 changed file with 6 additions and 0 deletions   Show diff stats
app/models/organization.rb
  Diff comments   View file @7564195
... ... @@ -147,6 +147,12 @@ class Organization < Profile
147 147 ]
148 148 end
149 149  
  150 + def short_name chars = 40
  151 + s = self.display_name
  152 + s = super(chars) if s.blank?
  153 + s
  154 + end
  155 +
150 156 def notification_emails
151 157 emails = [contact_email].select(&:present?) + admins.map(&:email)
152 158 if emails.empty?
... ...