Download as
Browse Code »

Commit 02eedc73b787da575a4f82214bc89cc985ed8b18

Authored by Aurelio A. Heckert
Committed by Aurélio A. Heckert
1 parent 82c567f2
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Enable Blog in the ArticleBlock 

ActionItem2381
Showing 5 changed files with 35 additions and 6 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @02eedc7
@@ -30,6 +30,10 @@ module ApplicationHelper @@ -30,6 +30,10 @@ module ApplicationHelper
30 30
31 include AccountHelper 31 include AccountHelper
32 32
  33 + include BlogHelper
  34 +
  35 + include ContentViewerHelper
  36 +
33 def locale 37 def locale
34 (@page && !@page.language.blank?) ? @page.language : FastGettext.locale 38 (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
35 end 39 end
app/models/article_block.rb
  Diff comments   View file @02eedc7
@@ -12,7 +12,7 @@ class ArticleBlock < Block @@ -12,7 +12,7 @@ class ArticleBlock < Block
12 block = self 12 block = self
13 lambda do 13 lambda do
14 block_title(block.title) + 14 block_title(block.title) +
15 - (block.article ? article_to_html(block.article, :gallery_view => false) : _('Article not selected yet.')) 15 + (block.article ? article_to_html(block.article, :gallery_view=>false, :inside_block=>block) : _('Article not selected yet.'))
16 end 16 end
17 end 17 end
18 18
app/models/blog.rb
  Diff comments   View file @02eedc7
@@ -24,8 +24,9 @@ class Blog < Folder @@ -24,8 +24,9 @@ class Blog < Folder
24 # FIXME isn't this too much including just to be able to generate some HTML? 24 # FIXME isn't this too much including just to be able to generate some HTML?
25 include ActionView::Helpers::TagHelper 25 include ActionView::Helpers::TagHelper
26 def to_html(options = {}) 26 def to_html(options = {})
  27 + me = self
27 lambda do 28 lambda do
28 - render :file => 'content_viewer/blog_page' 29 + render :file => 'content_viewer/blog_page', :locals => { :blog=>me, :inside_block=>options[:inside_block] }
29 end 30 end
30 end 31 end
31 32
app/views/content_viewer/blog_page.rhtml
  Diff comments   View file @02eedc7
1 -<% add_rss_feed_to_head(@page.name, @page.feed.url) if @page.blog? && @page.feed %> 1 +<% add_rss_feed_to_head(blog.name, blog.feed.url) if blog.blog? && blog.feed %>
2 2
3 -<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if @page.blog? && @page.external_feed && @page.external_feed.enabled && @page.external_feed.fetched_at.nil? %> 3 +<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if blog.blog? && blog.external_feed && blog.external_feed.enabled && blog.external_feed.fetched_at.nil? %>
4 4
5 <div> 5 <div>
6 <div class='blog-description'> 6 <div class='blog-description'>
7 - <%= @page.body %> 7 + <%= blog.body %>
8 </div> 8 </div>
9 </div> 9 </div>
10 <hr class="pre-posts"/> 10 <hr class="pre-posts"/>
11 <div class="blog-posts"> 11 <div class="blog-posts">
12 - <%= (@page.empty? ? content_tag('em', _('(no posts)')) : list_posts(@posts, @page.visualization_format)) %> 12 + <%=
  13 + posts = @posts
  14 + if inside_block
  15 + posts = blog.posts.paginate(:page=>1, :per_page=>1)
  16 + end
  17 + (blog.empty? ? content_tag('em', _('(no posts)')) : list_posts(posts, blog.visualization_format))
  18 + %>
13 </div> 19 </div>
test/integration/blocks_integration_test.rb 0 → 100644
  Diff comments   View file @02eedc7
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
  1 +require "#{File.dirname(__FILE__)}/../test_helper"
  2 +
  3 +class BlocksIntegrationTest < ActionController::IntegrationTest
  4 +
  5 + should "allow blog as block content" do
  6 + profile = fast_create(Profile)
  7 + blog = fast_create(Blog, :name => 'Blog', :profile_id => profile.id)
  8 + post = fast_create(TinyMceArticle, :name => "A Post", :profile_id => profile.id, :parent_id => blog.id, :body => 'Lorem ipsum dolor sit amet')
  9 + block = ArticleBlock.new
  10 + block.article = blog
  11 + profile.boxes << Box.new
  12 + profile.boxes.first.blocks << block
  13 +
  14 + get "/profile/#{profile.identifier}"
  15 + assert_match(/Lorem ipsum dolor sit amet/, @response.body)
  16 + end
  17 +
  18 +end