From 2d3b14bf016200f669a2669dcbd1e5bdf3ae5b50 Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Fri, 20 Mar 2015 15:18:25 -0300
Subject: [PATCH] Fix proposal edition layout

---
 lib/proposals_discussion_plugin.rb            |  2 +-
 public/style.css                              |  5 ++++-
 test/unit/proposals_discussion_plugin_test.rb | 13 ++++++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/proposals_discussion_plugin.rb b/lib/proposals_discussion_plugin.rb
index 98a2252..40d4009 100644
--- a/lib/proposals_discussion_plugin.rb
+++ b/lib/proposals_discussion_plugin.rb
@@ -13,7 +13,7 @@ class ProposalsDiscussionPlugin < Noosfero::Plugin
   end
 
   def content_types
-    if context.respond_to?(:params) && context.params
+    if context.respond_to?(:params) && context.params.kind_of?(Hash) && context.params[:controller] == 'cms' && context.params[:action] == 'new'
       types = []
       parent_id = context.params[:parent_id]
       parent = parent_id ? context.profile.articles.find(parent_id) : nil
diff --git a/public/style.css b/public/style.css
index f6dd57e..9d0e302 100644
--- a/public/style.css
+++ b/public/style.css
@@ -132,8 +132,11 @@
   position: relative;
 }
 
+form .proposals-discussion-plugin .title {
+  width: 50%;
+}
 form .proposals-discussion-plugin textarea {
-  width: 98%;
+  width: 100%;
 }
 
 form .proposals-discussion-plugin .abstract textarea {
diff --git a/test/unit/proposals_discussion_plugin_test.rb b/test/unit/proposals_discussion_plugin_test.rb
index 4918fd8..3b45c07 100644
--- a/test/unit/proposals_discussion_plugin_test.rb
+++ b/test/unit/proposals_discussion_plugin_test.rb
@@ -5,7 +5,7 @@ class ProposalsDiscussionPluginTest < ActiveSupport::TestCase
   def setup
     @plugin = ProposalsDiscussionPlugin.new
     @profile = fast_create(Community)
-    @params = {}
+    @params = {:controller => 'cms', :action => 'new'}
     @plugin.stubs(:context).returns(self)
   end
 
@@ -43,6 +43,17 @@ class ProposalsDiscussionPluginTest < ActiveSupport::TestCase
     assert_not_includes plugin.content_types, ProposalsDiscussionPlugin::Proposal
   end
 
+  should 'return all content types if the context controller is not cms' do
+    params[:controller] = 'content_viewer'
+    assert_equal [ProposalsDiscussionPlugin::Discussion, ProposalsDiscussionPlugin::Topic, ProposalsDiscussionPlugin::Proposal], plugin.content_types
+  end
+
+  should 'return all content types if the context controller is cms and action is not new' do
+    params[:controller] = 'cms'
+    params[:action] = 'edit'
+    assert_equal [ProposalsDiscussionPlugin::Discussion, ProposalsDiscussionPlugin::Topic, ProposalsDiscussionPlugin::Proposal], plugin.content_types
+  end
+
   should 'remove new button from content page for a discussion' do
     page = fast_create(ProposalsDiscussionPlugin::Discussion, :profile_id => @profile.id)
     assert plugin.content_remove_new(page)
--
libgit2 0.21.2