Display on forum topics the same information available at blog's post header

Victor Costa
1 parent 3971931c
Showing 3 changed files with 13 additions and 2 deletions Show diff stats
app/helpers/content_viewer_helper.rb
app/models/article.rb
test/unit/content_viewer_helper_test.rb
@@ -16,7 +16,7 @@ module ContentViewerHelper
     title = article.display_title if article.kind_of?(UploadedFile) && article.image?
     title = article.title if title.blank?
     title = content_tag('h1', h(title), :class => 'title')
-    if article.belongs_to_blog?
+    if article.belongs_to_blog? || article.belongs_to_forum?
       unless args[:no_link]
         title = content_tag('h1', link_to(article.name, article.url), :class => 'title')
       end
@@ -291,6 +291,10 @@ class Article &lt; ActiveRecord::Base
   def belongs_to_blog?
     self.parent and self.parent.blog?
   end
+  
+  def belongs_to_forum?
+    self.parent and self.parent.forum?
+  end
   def info_from_last_update
     last_comment = comments.last
@@ -18,8 +18,15 @@ class ContentViewerHelperTest &lt; ActiveSupport::TestCase
     result = article_title(post)
     assert_tag_in_string result, :tag => 'span', :content => show_date(post.published_at)
   end
+  
+  should 'display published-at for forum posts' do
+    forum = fast_create(Forum, :name => 'Forum test', :profile_id => profile.id)
+    post = TextileArticle.create!(:name => 'post test', :profile => profile, :parent => forum)
+    result = article_title(post)
+    assert_tag_in_string result, :tag => 'span', :content => show_date(post.published_at)
+  end
-  should 'not display published-at for non-blog posts' do
+  should 'not display published-at for non-blog and non-forum posts' do
     article = TextileArticle.create!(:name => 'article for test', :profile => profile)
     result = article_title(article)
     assert_no_match /<span class="date">#{show_date(article.published_at)}<\/span><span class="author">, by .*#{profile.identifier}/, result
	@@ -16,7 +16,7 @@ module ContentViewerHelper		@@ -16,7 +16,7 @@ module ContentViewerHelper
16	title = article.display_title if article.kind_of?(UploadedFile) && article.image?	16	title = article.display_title if article.kind_of?(UploadedFile) && article.image?
17	title = article.title if title.blank?	17	title = article.title if title.blank?
18	title = content_tag('h1', h(title), :class => 'title')	18	title = content_tag('h1', h(title), :class => 'title')
19	- if article.belongs_to_blog?	19	+ if article.belongs_to_blog? \|\| article.belongs_to_forum?
20	unless args[:no_link]	20	unless args[:no_link]
21	title = content_tag('h1', link_to(article.name, article.url), :class => 'title')	21	title = content_tag('h1', link_to(article.name, article.url), :class => 'title')
22	end	22	end