Merge branch 'release/4.3' into dev

pull/6827/head
Jens Ulferts 9 years ago
commit 2620d30dfc
  1. 4
      lib/open_project/reporting/engine.rb

@ -63,9 +63,13 @@ module OpenProject::Reporting
if: Proc.new { |project| project.module_enabled?(:reporting_module) }, if: Proc.new { |project| project.module_enabled?(:reporting_module) },
html: { class: 'icon2 icon-stats' } html: { class: 'icon2 icon-stats' }
# Cost reports should remove the default time entries menu item
hide_menu_item :project_menu, hide_menu_item :project_menu,
:time_entries, :time_entries,
hide_if: -> (project) { project.module_enabled?(:reporting_module) } hide_if: -> (project) { project.module_enabled?(:reporting_module) }
hide_menu_item :top_menu,
:time_sheet
end end
initializer "reporting.register_hooks" do initializer "reporting.register_hooks" do

Loading…
Cancel
Save