From e205320fe50ed74568c2098cc980dfea9286dcc9 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Thu, 20 Nov 2014 15:22:29 -0300 Subject: [PATCH] proposals_discussion: allow creation of discussion with a parent --- lib/proposals_discussion_plugin.rb | 2 +- test/unit/proposals_discussion_plugin_test.rb | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/proposals_discussion_plugin.rb b/lib/proposals_discussion_plugin.rb index ec0739b..bb55542 100644 --- a/lib/proposals_discussion_plugin.rb +++ b/lib/proposals_discussion_plugin.rb @@ -17,7 +17,7 @@ class ProposalsDiscussionPlugin < Noosfero::Plugin types = [] parent_id = context.params[:parent_id] parent = parent_id ? context.profile.articles.find(parent_id) : nil - types << ProposalsDiscussionPlugin::Discussion unless parent + types << ProposalsDiscussionPlugin::Discussion types << ProposalsDiscussionPlugin::Topic if parent.kind_of?(ProposalsDiscussionPlugin::Discussion) types << ProposalsDiscussionPlugin::Proposal if parent.kind_of?(ProposalsDiscussionPlugin::Topic) types diff --git a/test/unit/proposals_discussion_plugin_test.rb b/test/unit/proposals_discussion_plugin_test.rb index 2b4944d..1b1b235 100644 --- a/test/unit/proposals_discussion_plugin_test.rb +++ b/test/unit/proposals_discussion_plugin_test.rb @@ -20,12 +20,6 @@ class ProposalsDiscussionPluginTest < ActiveSupport::TestCase assert_includes plugin.content_types, ProposalsDiscussionPlugin::Discussion end - should 'do not return Discussion as a content type if it has a parent' do - parent = fast_create(Folder, :profile_id => @profile.id) - @params[:parent_id] = parent.id - assert_not_includes plugin.content_types, ProposalsDiscussionPlugin::Discussion - end - should 'return Topic as a content type if parent is a Discussion' do parent = fast_create(ProposalsDiscussionPlugin::Discussion, :profile_id => @profile.id) @params[:parent_id] = parent.id -- libgit2 0.21.2