Merge branch 'release/4.2' into release/4.3

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

@ -45,7 +45,7 @@ module OpenProject::Reporting
end
#menu extensions
menu :top_menu, :cost_reports_global, {controller: 'cost_reports', action: 'index', project_id: nil},
menu :top_menu, :cost_reports_global, {controller: '/cost_reports', action: 'index', project_id: nil},
caption: :cost_reports_title,
if: Proc.new {
( User.current.allowed_to?(:view_time_entries, nil, global: true) ||
@ -56,7 +56,7 @@ module OpenProject::Reporting
}
menu :project_menu, :cost_reports,
{controller: 'cost_reports', action: 'index'},
{controller: '/cost_reports', action: 'index'},
param: :project_id,
after: :time_entries,
caption: :cost_reports_title,

Loading…
Cancel
Save