[Git][noosfero/noosfero][master] 2 commits: organizations: use display_name on short_name

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
2d4236dc by Braulio Bhavamitra at 2015-06-17T13:14:59Z
organizations: use display_name on short_name

- - - - -
7564195b by Bráulio Bhavamitra at 2015-06-17T23:25:24Z
Merge branch 'display-name-as-short-name' into 'master'

organizations: use display_name on short_name

See merge request !554

- - - - -


1 changed file:

- app/models/organization.rb


Changes:

=====================================
app/models/organization.rb
=====================================
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -147,6 +147,12 @@ class Organization < Profile
     ]
   end
 
+  def short_name chars = 40
+    s = self.display_name
+    s = super(chars) if s.blank?
+    s
+  end
+
   def notification_emails
     emails = [contact_email].select(&:present?) + admins.map(&:email)
     if emails.empty?



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/b84467b5aacdb6d87ae97f1044383b2e77d6d9d4...7564195bacfaebfeaf221401f6aab07ffaf335ba
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150617/61f9b79e/attachment.html>