Download as
Browse Code »

Commit ad8d04a7591f3ca236501670e47c9260019c5ffe

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent 086a90b6
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

Created short_title on article and used it on button 

(ActionItem1625)
Showing 3 changed files with 12 additions and 1 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @ad8d04a
@@ -189,6 +189,11 @@ class Article < ActiveRecord::Base @@ -189,6 +189,11 @@ class Article < ActiveRecord::Base
189 name 189 name
190 end 190 end
191 191
  192 + include ActionView::Helpers::TextHelper
  193 + def short_title
  194 + truncate self.title, 15, '...'
  195 + end
  196 +
192 def belongs_to_blog? 197 def belongs_to_blog?
193 self.parent and self.parent.blog? 198 self.parent and self.parent.blog?
194 end 199 end
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @ad8d04a
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 66
67 <% if @page.parent && !@page.parent.path.blank? %> 67 <% if @page.parent && !@page.parent.path.blank? %>
68 <div id="article-parent"> 68 <div id="article-parent">
69 - <%= button(:back, _('Go back to %s') % @page.parent.title, @page.parent.url) %> 69 + <%= button(:back, _('Go back to %s') % @page.parent.short_title, @page.parent.url) %>
70 </div> 70 </div>
71 <% end %> 71 <% end %>
72 72
test/unit/article_test.rb
  Diff comments   View file @ad8d04a
@@ -873,4 +873,10 @@ class ArticleTest &lt; Test::Unit::TestCase @@ -873,4 +873,10 @@ class ArticleTest &lt; Test::Unit::TestCase
873 assert_no_match /[<>]/, article.name 873 assert_no_match /[<>]/, article.name
874 end 874 end
875 875
  876 + should 'return truncated title in short_title' do
  877 + article = Article.new
  878 + article.name = 'a123456789abcdefghij'
  879 + assert_equal 'a123456789ab...', article.short_title
  880 + end
  881 +
876 end 882 end