Download as
Browse Code »

Commit ea27f5be314e8247d26dc93ffd4949a5c35818b6

Authored by Antonio Terceiro
1 parent 662babb3
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

Remove warning on trucate calls 

Truncate now takes length and omission parameters in a options hash
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @ea27f5b
@@ -225,7 +225,7 @@ class Article < ActiveRecord::Base @@ -225,7 +225,7 @@ class Article < ActiveRecord::Base
225 225
226 include ActionView::Helpers::TextHelper 226 include ActionView::Helpers::TextHelper
227 def short_title 227 def short_title
228 - truncate self.title, 15, '...' 228 + truncate self.title, :length => 15, :omission => '...'
229 end 229 end
230 230
231 def belongs_to_blog? 231 def belongs_to_blog?
@@ -487,7 +487,7 @@ class Article < ActiveRecord::Base @@ -487,7 +487,7 @@ class Article < ActiveRecord::Base
487 end 487 end
488 488
489 def short_lead 489 def short_lead
490 - truncate sanitize_html(self.lead), 170, '...' 490 + truncate sanitize_html(self.lead), :length => 170, :omission => '...'
491 end 491 end
492 492
493 def creator 493 def creator
app/models/profile.rb
  Diff comments   View file @ea27f5b
@@ -631,7 +631,7 @@ private :generate_url, :url_options @@ -631,7 +631,7 @@ private :generate_url, :url_options
631 include ActionView::Helpers::TextHelper 631 include ActionView::Helpers::TextHelper
632 def short_name(chars = 40) 632 def short_name(chars = 40)
633 if self[:nickname].blank? 633 if self[:nickname].blank?
634 - truncate self.name, chars, '...' 634 + truncate self.name, :length => chars, :omission => '...'
635 else 635 else
636 self[:nickname] 636 self[:nickname]
637 end 637 end