Merge branch 'hotfixes' into stable

Francisco Júnior
2 parents 8e21cd98 14be2fff
Showing 1 changed file with 1 additions and 0 deletions Show diff stats
plugins/work_assignment/lib/work_assignment_plugin.rb
@@ -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
	@@ -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