Merge branch 'article_display_media_panel' into 'master'

Allow article types to define when media panel should be displayed See merge request !633

Merge branch 'article_display_media_panel' into 'master'
Allow article types to define when media panel should be displayed See merge request !633
Victor Costa
2 parents 03e838f1 16b6f59f
Showing 11 changed files with 69 additions and 4 deletions Show diff stats
app/models/article.rb
app/models/enterprise_homepage.rb
app/models/event.rb
app/models/textile_article.rb
app/models/tiny_mce_article.rb
app/views/cms/edit.html.erb
test/unit/article_test.rb
test/unit/enterprise_homepage_test.rb
test/unit/event_test.rb
test/unit/textile_article_test.rb
test/unit/tiny_mce_article_test.rb
@@ -635,6 +635,14 @@ class Article &lt; ActiveRecord::Base
     can_display_hits? && display_hits
   end
+  def display_media_panel?
+    can_display_media_panel? && environment.enabled?('media_panel')
+  end
+
+  def can_display_media_panel?
+    false
+  end
+
   def image?
     false
   end
@@ -35,4 +35,8 @@ class EnterpriseHomepage &lt; Article
     false
   end
+  def can_display_media_panel?
+    true
+  end
+
 end
@@ -134,6 +134,10 @@ class Event &lt; Article
     true
   end
+  def can_display_media_panel?
+    true
+  end
+
   include Noosfero::TranslatableContent
   include MaybeAddHttp
@@ -24,6 +24,10 @@ class TextileArticle &lt; TextArticle
     true
   end
+  def can_display_media_panel?
+    true
+  end
+
   protected
   def convert_to_html(textile)
@@ -28,4 +28,8 @@ class TinyMceArticle &lt; TextArticle
     true
   end
+  def can_display_media_panel?
+    true
+  end
+
 end
 <%= error_messages_for 'article' %>
-<% show_media_panel = environment.enabled?('media_panel') && [TinyMceArticle, TextileArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
-
-<div class='<%= (show_media_panel ? 'with_media_panel' : 'no_media_panel') %>'>
+<div class='<%= (@article.display_media_panel? ? 'with_media_panel' : 'no_media_panel') %>'>
 <%= labelled_form_for 'article', :html => { :multipart => true, :class => @type } do |f| %>
   <%= hidden_field_tag("type", @type) if @type %>
@@ -68,7 +66,7 @@
 <% end %>
 </div>
-<% if show_media_panel %>
+<% if @article.display_media_panel? %>
   <%= render :partial => 'text_editor_sidebar' %>
 <% end %>
@@ -2191,4 +2191,27 @@ class ArticleTest &lt; ActiveSupport::TestCase
     article.destroy
   end
+  should 'have can_display_media_panel with default false' do
+    a = Article.new
+    assert !a.can_display_media_panel?
+  end
+
+  should 'display media panel when allowed by the environment' do
+    a = Article.new
+    a.expects(:can_display_media_panel?).returns(true)
+    environment = mock
+    a.expects(:environment).returns(environment)
+    environment.expects(:enabled?).with('media_panel').returns(true)
+    assert a.display_media_panel?
+  end
+
+  should 'not display media panel when not allowed by the environment' do
+    a = Article.new
+    a.expects(:can_display_media_panel?).returns(true)
+    environment = mock
+    a.expects(:environment).returns(environment)
+    environment.expects(:enabled?).with('media_panel').returns(false)
+    assert !a.display_media_panel?
+  end
+
 end
@@ -26,4 +26,9 @@ class EnterpriseHomepageTest &lt; ActiveSupport::TestCase
     assert_equal false, a.can_display_hits?
   end
+  should 'have can_display_media_panel with default true' do
+    a = EnterpriseHomepage.new
+    assert a.can_display_media_panel?
+  end
+
 end
@@ -346,4 +346,9 @@ class EventTest &lt; ActiveSupport::TestCase
     assert event.translatable?
   end
+  should 'have can_display_media_panel with default true' do
+    a = Event.new
+    assert a.can_display_media_panel?
+  end
+
 end
@@ -174,6 +174,11 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
     assert_equal "<p>one\nparagraph</p>", build_article("one\nparagraph").to_html
   end
+  should 'have can_display_media_panel with default true' do
+    a = TextileArticle.new
+    assert a.can_display_media_panel?
+  end
+
   protected
   def build_article(input = nil, options = {})
@@ -235,4 +235,9 @@ end
       :attributes => { :colspan => 2, :rowspan => 3 }
   end
+  should 'have can_display_media_panel with default true' do
+    a = TinyMceArticle.new
+    assert a.can_display_media_panel?
+  end
+
 end
	@@ -635,6 +635,14 @@ class Article < ActiveRecord::Base		@@ -635,6 +635,14 @@ class Article < ActiveRecord::Base
635	can_display_hits? && display_hits	635	can_display_hits? && display_hits
636	end	636	end
637		637
		638	+ def display_media_panel?
		639	+ can_display_media_panel? && environment.enabled?('media_panel')
		640	+ end
		641	+
		642	+ def can_display_media_panel?
		643	+ false
		644	+ end
		645	+
638	def image?	646	def image?
639	false	647	false
640	end	648	end
	@@ -35,4 +35,8 @@ class EnterpriseHomepage < Article		@@ -35,4 +35,8 @@ class EnterpriseHomepage < Article
35	false	35	false
36	end	36	end
37		37
		38	+ def can_display_media_panel?
		39	+ true
		40	+ end
		41	+
38	end	42	end
	@@ -28,4 +28,8 @@ class TinyMceArticle < TextArticle		@@ -28,4 +28,8 @@ class TinyMceArticle < TextArticle
28	true	28	true
29	end	29	end
30		30
		31	+ def can_display_media_panel?
		32	+ true
		33	+ end
		34	+
31	end	35	end
	@@ -2191,4 +2191,27 @@ class ArticleTest < ActiveSupport::TestCase		@@ -2191,4 +2191,27 @@ class ArticleTest < ActiveSupport::TestCase
2191	article.destroy	2191	article.destroy
2192	end	2192	end
2193		2193
		2194	+ should 'have can_display_media_panel with default false' do
		2195	+ a = Article.new
		2196	+ assert !a.can_display_media_panel?
		2197	+ end
		2198	+
		2199	+ should 'display media panel when allowed by the environment' do
		2200	+ a = Article.new
		2201	+ a.expects(:can_display_media_panel?).returns(true)
		2202	+ environment = mock
		2203	+ a.expects(:environment).returns(environment)
		2204	+ environment.expects(:enabled?).with('media_panel').returns(true)
		2205	+ assert a.display_media_panel?
		2206	+ end
		2207	+
		2208	+ should 'not display media panel when not allowed by the environment' do
		2209	+ a = Article.new
		2210	+ a.expects(:can_display_media_panel?).returns(true)
		2211	+ environment = mock
		2212	+ a.expects(:environment).returns(environment)
		2213	+ environment.expects(:enabled?).with('media_panel').returns(false)
		2214	+ assert !a.display_media_panel?
		2215	+ end
		2216	+
2194	end	2217	end
	@@ -26,4 +26,9 @@ class EnterpriseHomepageTest < ActiveSupport::TestCase		@@ -26,4 +26,9 @@ class EnterpriseHomepageTest < ActiveSupport::TestCase
26	assert_equal false, a.can_display_hits?	26	assert_equal false, a.can_display_hits?
27	end	27	end
28		28
		29	+ should 'have can_display_media_panel with default true' do
		30	+ a = EnterpriseHomepage.new
		31	+ assert a.can_display_media_panel?
		32	+ end
		33	+
29	end	34	end
	@@ -346,4 +346,9 @@ class EventTest < ActiveSupport::TestCase		@@ -346,4 +346,9 @@ class EventTest < ActiveSupport::TestCase
346	assert event.translatable?	346	assert event.translatable?
347	end	347	end
348		348
		349	+ should 'have can_display_media_panel with default true' do
		350	+ a = Event.new
		351	+ assert a.can_display_media_panel?
		352	+ end
		353	+
349	end	354	end
	@@ -235,4 +235,9 @@ end		@@ -235,4 +235,9 @@ end
235	:attributes => { :colspan => 2, :rowspan => 3 }	235	:attributes => { :colspan => 2, :rowspan => 3 }
236	end	236	end
237		237
		238	+ should 'have can_display_media_panel with default true' do
		239	+ a = TinyMceArticle.new
		240	+ assert a.can_display_media_panel?
		241	+ end
		242	+
238	end	243	end