Download as
Browse Code »

Commit 9fe54f9ef329165a7eba27e5dfd07aa589aa3ea1

Authored by Moises Machado
Committed by Antonio Terceiro
1 parent 62b11ca9
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

ActionItem1189: published article goes to selected folder

Showing 2 changed files with 17 additions and 3 deletions   Show diff stats
app/models/published_article.rb
  Diff comments   View file @9fe54f9
1 1 class PublishedArticle < Article
2 2 before_create do |article|
3   - parent = article.reference_article.parent
4   - if parent && parent.blog? && article.profile.has_blog?
5   - article.parent = article.profile.blog
  3 + unless article.parent
  4 + parent = article.reference_article.parent
  5 + if parent && parent.blog? && article.profile.has_blog?
  6 + article.parent = article.profile.blog
  7 + end
6 8 end
7 9 end
8 10  
... ...
test/unit/published_article_test.rb
  Diff comments   View file @9fe54f9
... ... @@ -110,4 +110,16 @@ class PublishedArticleTest &lt; ActiveSupport::TestCase
110 110  
111 111 assert_match /removed/, p.to_html
112 112 end
  113 +
  114 + should 'specified parent overwrite blog' do
  115 + parent = mock
  116 + @article.stubs(:parent).returns(parent)
  117 + parent.stubs(:blog?).returns(true)
  118 + prof = Community.create!(:name => 'test_comm', :identifier => 'test_comm')
  119 + prof.articles << Blog.new(:profile => prof, :name => 'Blog test')
  120 + new_parent = Folder.create!(:profile => prof, :name => 'Folder test')
  121 + p = PublishedArticle.create!(:reference_article => @article, :profile => prof, :parent => new_parent)
  122 +
  123 + assert_equal p.parent, new_parent
  124 + end
113 125 end
... ...