Merge pull request #8373 from opf/feature/31728-Rename-the-module-Cost-reports-to-Time-and-costs

[31728] Rename the module Cost reports to Time and costs

[ci skip]
pull/8379/head
Oliver Günther 5 years ago committed by GitHub
commit 6b8d552790
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      modules/auth_plugins/lib/open_project/auth_plugins/engine.rb
  2. 2
      modules/backlogs/lib/open_project/backlogs/engine.rb
  3. 2
      modules/bim/lib/open_project/bim/engine.rb
  4. 2
      modules/costs/lib/open_project/costs/engine.rb
  5. 2
      modules/global_roles/lib/open_project/global_roles/engine.rb
  6. 2
      modules/meeting/lib/open_project/meeting/engine.rb
  7. 2
      modules/openid_connect/lib/open_project/openid_connect/engine.rb
  8. 2
      modules/pdf_export/lib/open_project/pdf_export/engine.rb
  9. 2
      modules/recaptcha/lib/open_project/recaptcha/engine.rb
  10. 4
      modules/reporting/app/controllers/cost_reports_controller.rb
  11. 3
      modules/reporting/config/locales/en.yml
  12. 9
      modules/reporting/lib/open_project/reporting/engine.rb
  13. 4
      modules/reporting/spec/features/menu_spec.rb
  14. 2
      modules/reporting/spec/features/subproject_spec.rb
  15. 2
      modules/two_factor_authentication/lib/open_project/two_factor_authentication/engine.rb
  16. 2
      modules/xls_export/lib/open_project/xls_export/engine.rb
  17. 4
      modules/xls_export/lib/open_project/xls_export/xls_views.rb

@ -36,7 +36,7 @@ module OpenProject::AuthPlugins
include OpenProject::Plugins::ActsAsOpEngine
register 'openproject-auth_plugins',
author_url: 'http://finn.de',
author_url: 'https://www.openproject.com',
bundled: true
initializer 'auth_plugins.register_hooks' do

@ -48,7 +48,7 @@ module OpenProject::Backlogs
include OpenProject::Plugins::ActsAsOpEngine
register 'openproject-backlogs',
author_url: 'http://finn.de',
author_url: 'https://www.openproject.com',
bundled: true,
settings: settings do
OpenProject::AccessControl.permission(:edit_project).tap do |add|

@ -37,7 +37,7 @@ module OpenProject::Bim
include OpenProject::Plugins::ActsAsOpEngine
register 'openproject-bim',
author_url: 'https://openproject.com',
author_url: 'https://www.openproject.com',
settings: {
default: {
}

@ -35,7 +35,7 @@ module OpenProject::Costs
include OpenProject::Plugins::ActsAsOpEngine
register 'openproject-costs',
author_url: 'http://finn.de',
author_url: 'https://www.openproject.com',
bundled: true,
settings: {
default: { 'costs_currency' => 'EUR','costs_currency_format' => '%n %u' },

@ -35,7 +35,7 @@ module OpenProject::GlobalRoles
include OpenProject::Plugins::ActsAsOpEngine
register 'openproject-global_roles',
author_url: 'http://finn.de',
author_url: 'https://www.openproject.com',
bundled: true
assets %w(global_roles/global_roles.js)

@ -35,7 +35,7 @@ module OpenProject::Meeting
include OpenProject::Plugins::ActsAsOpEngine
register 'openproject-meeting',
author_url: 'http://finn.de',
author_url: 'https://www.openproject.com',
bundled: true do
project_module :meetings do
permission :view_meetings, meetings: [:index, :show], meeting_agendas: [:history, :show, :diff], meeting_minutes: [:history, :show, :diff]

@ -8,7 +8,7 @@ module OpenProject::OpenIDConnect
extend OpenProject::Plugins::AuthPlugin
register 'openproject-openid_connect',
author_url: 'http://finn.de',
author_url: 'https://www.openproject.com',
bundled: true,
settings: { 'default' => { 'providers' => {} } } do
menu :admin_menu,

@ -35,7 +35,7 @@ module OpenProject::PDFExport
include OpenProject::Plugins::ActsAsOpEngine
register 'openproject-pdf_export',
author_url: 'http://finn.de',
author_url: 'https://www.openproject.com',
bundled: true do
menu :admin_menu,

@ -8,7 +8,7 @@ module OpenProject::Recaptcha
include OpenProject::Plugins::ActsAsOpEngine
register 'openproject-recaptcha',
author_url: 'http://openproject.com',
author_url: 'https://www.openproject.com',
settings: {
default: {
recaptcha_type: ::OpenProject::Recaptcha::TYPE_DISABLED

@ -315,8 +315,4 @@ class CostReportsController < ApplicationController
def find_optional_user
@current_user = User.current || User.anonymous
end
def default_breadcrumb
l(:cost_reports_title)
end
end

@ -31,8 +31,9 @@ en:
button_save_as: "Save report as..."
comments: "Comment"
cost_reports_title: "Cost reports"
cost_reports_title: "Time and costs"
label_cost_report: "Cost report"
label_cost_report_plural: "Cost reports"
description_drill_down: "Show details"
description_filter_selection: "Selection"

@ -33,7 +33,7 @@ module OpenProject::Reporting
include OpenProject::Plugins::ActsAsOpEngine
register 'openproject-reporting',
author_url: 'https://www.openproject.org',
author_url: 'https://www.openproject.com',
bundled: true do
view_actions = [:index, :show, :drill_down, :available_values, :display_report_list]
@ -60,7 +60,9 @@ module OpenProject::Reporting
OpenProject::AccessControl.permission(:view_own_cost_entries).actions << "work_package_costlog/index"
#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.logged? || !Setting.login_required?) &&
@ -72,7 +74,8 @@ module OpenProject::Reporting
)
}
menu :project_menu, :cost_reports,
menu :project_menu,
:cost_reports,
{ controller: '/cost_reports', action: 'index' },
param: :project_id,
after: :time_entries,

@ -67,7 +67,7 @@ describe 'project menu', type: :feature do
end
it 'leads to cost reports' do
click_on 'Cost reports'
click_on 'Time and costs'
expect(page).to have_selector('.button--dropdown-text', text: 'Ponyo')
end
@ -96,7 +96,7 @@ describe 'project menu', type: :feature do
# doing what no human can - click on invisible items.
# This way, we avoid having to use selenium and by that increase stability.
within '#more-menu', visible: false do
click_on 'Cost reports', visible: false
click_on 'Time and costs', visible: false
end
# to make sure we're not seeing the project cost reports:

@ -18,7 +18,7 @@ describe 'Cost report in subproject', type: :feature, js: true do
it 'provides filtering' do
within '#main-menu' do
click_on 'Cost reports'
click_on 'Time and costs'
end
within '#content' do

@ -7,7 +7,7 @@ module OpenProject::TwoFactorAuthentication
include OpenProject::Plugins::ActsAsOpEngine
register 'openproject-two_factor_authentication',
author_url: 'http://openproject.com',
author_url: 'https://www.openproject.com',
settings: {
default: {
# Only app-based 2FA allowed per default

@ -5,7 +5,7 @@ module OpenProject::XlsExport
include OpenProject::Plugins::ActsAsOpEngine
register 'openproject-xls_export',
author_url: 'http://openproject.com/',
author_url: 'https://www.openproject.com',
bundled: true
patches %i[Queries::WorkPackages::Columns::WorkPackageColumn CostReportsController]

@ -55,7 +55,9 @@ class OpenProject::XlsExport::XlsViews
end
def set_title
spreadsheet.add_title("#{@project.name + ' >> ' if @project}#{I18n.t(:cost_reports_title)} (#{format_date(Date.today)})")
spreadsheet.add_title(
"#{@project.name + ' >> ' if @project}#{I18n.t(:label_cost_report_plural)} (#{format_date(Date.today)})"
)
end
def currency_format

Loading…
Cancel
Save