Merge branch 'hotfixes' of gitlab.com:participa/noosfero into hotfixes

Victor Costa
2 parents 55b340af 14be2fff
Showing 2 changed files with 2 additions and 0 deletions Show diff stats
plugins/community_track/lib/community_track_plugin.rb
plugins/work_assignment/lib/work_assignment_plugin.rb
@@ -13,6 +13,7 @@ class CommunityTrackPlugin &lt; Noosfero::Plugin
   end
   def content_types
+    return [] if !context.kind_of?(CmsController)
     if context.respond_to?(:params) && context.params
       types = []
       parent_id = context.params[:parent_id]
@@ -18,6 +18,7 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin
   end
   def content_types
+    return [] if !context.kind_of?(CmsController)
     [WorkAssignmentPlugin::WorkAssignment] if context.respond_to?(:profile) && context.profile.organization?
   end
	@@ -13,6 +13,7 @@ class CommunityTrackPlugin < Noosfero::Plugin		@@ -13,6 +13,7 @@ class CommunityTrackPlugin < Noosfero::Plugin
13	end	13	end
14		14
15	def content_types	15	def content_types
		16	+ return [] if !context.kind_of?(CmsController)
16	if context.respond_to?(:params) && context.params	17	if context.respond_to?(:params) && context.params
17	types = []	18	types = []
18	parent_id = context.params[:parent_id]	19	parent_id = context.params[:parent_id]
	@@ -18,6 +18,7 @@ class WorkAssignmentPlugin < Noosfero::Plugin		@@ -18,6 +18,7 @@ class WorkAssignmentPlugin < Noosfero::Plugin
18	end	18	end
19		19
20	def content_types	20	def content_types
		21	+ return [] if !context.kind_of?(CmsController)
21	[WorkAssignmentPlugin::WorkAssignment] if context.respond_to?(:profile) && context.profile.organization?	22	[WorkAssignmentPlugin::WorkAssignment] if context.respond_to?(:profile) && context.profile.organization?
22	end	23	end
23		24