diff --git a/app/controllers/angular_controller.rb b/app/controllers/angular_controller.rb index 11d9ddc5475..00e0d33399d 100644 --- a/app/controllers/angular_controller.rb +++ b/app/controllers/angular_controller.rb @@ -1,4 +1,5 @@ #-- encoding: UTF-8 + #-- copyright # OpenProject is an open source project management software. # Copyright (C) 2012-2020 the OpenProject GmbH diff --git a/modules/job_status/app/workers/job_status/application_job_with_status.rb b/modules/job_status/app/workers/job_status/application_job_with_status.rb index 510ec8552d9..b2262c39d1f 100644 --- a/modules/job_status/app/workers/job_status/application_job_with_status.rb +++ b/modules/job_status/app/workers/job_status/application_job_with_status.rb @@ -63,8 +63,6 @@ module JobStatus ## # Update the status code for a given job def upsert_status(status:, **args) - upsert_attributes = - # Can't use upsert, as we only want to insert the user_id once # and not update it repeatedly resource = ::JobStatus::Status.find_or_initialize_by(job_id: job_id) diff --git a/modules/job_status/config/locales/js-en.yml b/modules/job_status/config/locales/js-en.yml index f299b3dee3a..10afac4e895 100644 --- a/modules/job_status/config/locales/js-en.yml +++ b/modules/job_status/config/locales/js-en.yml @@ -6,7 +6,7 @@ en: title: 'Background job status' redirect: 'You are being redirected.' generic_messages: - not_found: 'This job could (no longer) be found.' + not_found: 'This job could not be found.' in_queue: 'The job has been queued and will be processed shortly.' in_process: 'The job is currently being processed.' error: 'The job has failed to complete.' diff --git a/modules/job_status/spec/features/job_status_spec.rb b/modules/job_status/spec/features/job_status_spec.rb index 8e662bd64a8..1a056fa4b57 100644 --- a/modules/job_status/spec/features/job_status_spec.rb +++ b/modules/job_status/spec/features/job_status_spec.rb @@ -39,6 +39,6 @@ describe 'Job status', type: :feature, js: true do visit '/job_statuses/something-that-does-not-exist' expect(page).to have_selector('.icon-big.icon-help', wait: 10) - expect(page).to have_content 'This job could (no longer) be found.' + expect(page).to have_content I18n.t('js.job_status.generic_messages.not_found') end end