From bee579711e627b8d5e6f39bf1e537bb525a3e052 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Thu, 20 Nov 2014 15:07:44 -0300 Subject: [PATCH] community_track: added plugin contents as enabled tools --- plugins/community_track/lib/community_track_plugin/step.rb | 8 ++++++-- plugins/community_track/test/unit/community_track_plugin/step_test.rb | 12 ++++++++++-- plugins/community_track/views/cms/community_track_plugin/_step.html.erb | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/plugins/community_track/lib/community_track_plugin/step.rb b/plugins/community_track/lib/community_track_plugin/step.rb index d49b885..5d1cc52 100644 --- a/plugins/community_track/lib/community_track_plugin/step.rb +++ b/plugins/community_track/lib/community_track_plugin/step.rb @@ -60,8 +60,12 @@ class CommunityTrackPlugin::Step < Folder accept_comments end - def self.enabled_tools - [TinyMceArticle, Forum, CommunityHubPlugin::Hub] + def enabled_tools + tools = [TinyMceArticle, Forum] + tools << CommunityHubPlugin::Hub if environment.plugin_enabled?('CommunityHubPlugin') + tools << ProposalsDiscussionPlugin::Discussion if environment.plugin_enabled?('ProposalsDiscussionPlugin') + tools << PairwisePlugin::PairwiseContent if environment.plugin_enabled?('PairwisePlugin') + tools end def to_html(options = {}) diff --git a/plugins/community_track/test/unit/community_track_plugin/step_test.rb b/plugins/community_track/test/unit/community_track_plugin/step_test.rb index 00f298b..12bb74c 100644 --- a/plugins/community_track/test/unit/community_track_plugin/step_test.rb +++ b/plugins/community_track/test/unit/community_track_plugin/step_test.rb @@ -1,5 +1,7 @@ require File.dirname(__FILE__) + '/../../test_helper' +module CommunityHubPlugin; class Hub < Article; end; end + class StepTest < ActiveSupport::TestCase def setup @@ -235,8 +237,14 @@ class StepTest < ActiveSupport::TestCase end should 'return enabled tools for a step' do - assert_includes CommunityTrackPlugin::Step.enabled_tools, TinyMceArticle - assert_includes CommunityTrackPlugin::Step.enabled_tools, Forum + assert_includes @step.enabled_tools, TinyMceArticle + assert_includes @step.enabled_tools, Forum + end + + should 'return hub as an enabled tool if the plugin is enabled' do + @step.environment.expects(:plugin_enabled?).with(anything).returns(false).at_least_once + @step.environment.expects(:plugin_enabled?).with('CommunityHubPlugin').returns(true) + assert_includes @step.enabled_tools, CommunityHubPlugin::Hub end should 'return class for selected tool' do diff --git a/plugins/community_track/views/cms/community_track_plugin/_step.html.erb b/plugins/community_track/views/cms/community_track_plugin/_step.html.erb index a807569..8cc1a9a 100644 --- a/plugins/community_track/views/cms/community_track_plugin/_step.html.erb +++ b/plugins/community_track/views/cms/community_track_plugin/_step.html.erb @@ -12,7 +12,7 @@ { :size => 14 }) )) %> - <%= labelled_form_field(_('Tool type'), select(:article, :tool_type, CommunityTrackPlugin::Step.enabled_tools.map {|t| [t.short_description, t.name]} )) %> + <%= labelled_form_field(_('Tool type'), select(:article, :tool_type, @article.enabled_tools.map {|t| [t.short_description, t.name]} )) %> <%= hidden_field_tag('success_back_to', url_for(@article.parent.view_url)) %> -- libgit2 0.21.2