Added option to configure if preview in posts will be displayed

(cherry picked from commit 840e77eb53a5432ff99e8fe4966c61aeba9df14d)

Added option to configure if preview in posts will be displayed
(cherry picked from commit 840e77eb53a5432ff99e8fe4966c61aeba9df14d)
Daniela Feitosa · Antonio Terceiro
1 parent 26a8cdfc
Showing 6 changed files with 32 additions and 3 deletions Show diff stats
app/helpers/blog_helper.rb
app/models/article.rb
app/models/text_article.rb
app/views/content_viewer/_article_title.html.erb
test/unit/article_test.rb
test/unit/text_article_test.rb
@@ -6,7 +6,13 @@ module BlogHelper
     @article = article
     hidden_field_tag('article[published]', 1) +
     hidden_field_tag('article[accept_comments]', 0) +
-    visibility_options(article,tokenized_children)
+    visibility_options(article,tokenized_children) +
+    content_tag('h4', _('Visualization of posts')) +
+    content_tag(
+      'div',
+      check_box(:article, :display_preview) +
+      content_tag('label', _('I want to display the preview of posts before the text'), :for => 'article_display_preview')
+    )
   end
   def cms_label_for_new_children
@@ -8,7 +8,8 @@ class Article &lt; ActiveRecord::Base
                   :accept_comments, :feed, :published, :source, :source_name,
                   :highlighted, :notify_comments, :display_hits, :slug,
                   :external_feed_builder, :display_versions, :external_link,
-                  :image_builder, :show_to_followers
+                  :image_builder, :show_to_followers,
+                  :display_preview
   acts_as_having_image
@@ -634,6 +635,12 @@ class Article &lt; ActiveRecord::Base
     can_display_hits? && display_hits
   end
+  settings_items :display_preview, :type => :boolean, :default => false
+
+  def display_preview?
+    false
+  end
+
   def image?
     false
   end
@@ -41,4 +41,8 @@ class TextArticle &lt; Article
     end
   end
+  def display_preview?
+    parent && parent.kind_of?(Blog) && parent.display_preview
+  end
+
 end
@@ -7,7 +7,7 @@
     <% end %>
   </h1>
   <%= render :partial => "publishing_info" %>
-  <% unless @page.abstract.blank? %>
+  <% if @page.display_preview? %>
     <div class="preview">
       <%= @page.lead %>
     </div>
@@ -2180,4 +2180,8 @@ class ArticleTest &lt; ActiveSupport::TestCase
     article.destroy
   end
+  should 'have display_preview' do
+    a = Article.new(:display_preview => false)
+    assert !a.display_preview?
+  end
 end
@@ -120,4 +120,12 @@ class TextArticleTest &lt; ActiveSupport::TestCase
     assert text.translatable?
   end
+  should 'display preview when configured on parent that is a blog' do
+    person = fast_create(Person)
+    post = fast_create(TextArticle, :profile_id => person.id)
+    blog = Blog.new(:display_preview => true)
+    post.parent = blog
+    assert post.display_preview?
+  end
+
 end
	@@ -41,4 +41,8 @@ class TextArticle < Article		@@ -41,4 +41,8 @@ class TextArticle < Article
41	end	41	end
42	end	42	end
43		43
		44	+ def display_preview?
		45	+ parent && parent.kind_of?(Blog) && parent.display_preview
		46	+ end
		47	+
44	end	48	end
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7	<% end %>	7	<% end %>
8	</h1>	8	</h1>
9	<%= render :partial => "publishing_info" %>	9	<%= render :partial => "publishing_info" %>
10	- <% unless @page.abstract.blank? %>	10	+ <% if @page.display_preview? %>
11	<div class="preview">	11	<div class="preview">
12	<%= @page.lead %>	12	<%= @page.lead %>
13	</div>	13	</div>
	@@ -2180,4 +2180,8 @@ class ArticleTest < ActiveSupport::TestCase		@@ -2180,4 +2180,8 @@ class ArticleTest < ActiveSupport::TestCase
2180	article.destroy	2180	article.destroy
2181	end	2181	end
2182		2182
		2183	+ should 'have display_preview' do
		2184	+ a = Article.new(:display_preview => false)
		2185	+ assert !a.display_preview?
		2186	+ end
2183	end	2187	end
	@@ -120,4 +120,12 @@ class TextArticleTest < ActiveSupport::TestCase		@@ -120,4 +120,12 @@ class TextArticleTest < ActiveSupport::TestCase
120	assert text.translatable?	120	assert text.translatable?
121	end	121	end
122		122
		123	+ should 'display preview when configured on parent that is a blog' do
		124	+ person = fast_create(Person)
		125	+ post = fast_create(TextArticle, :profile_id => person.id)
		126	+ blog = Blog.new(:display_preview => true)
		127	+ post.parent = blog
		128	+ assert post.display_preview?
		129	+ end
		130	+
123	end	131	end