From f131b899a3bd9357a45a207ccd24aef9d74ed621 Mon Sep 17 00:00:00 2001 From: Eduardo Navarro Date: Wed, 13 Nov 2019 15:41:09 +0100 Subject: [PATCH 1/2] Use a default argument instead the ternary operator Co-authored-by: David Kang --- src/api/app/models/package.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/app/models/package.rb b/src/api/app/models/package.rb index 40698f9a47e..dba82691e8b 100644 --- a/src/api/app/models/package.rb +++ b/src/api/app/models/package.rb @@ -915,9 +915,9 @@ def buildresult(prj = project, show_all = false) end # FIXME: That you can overwrite package_name is rather confusing, but needed because of multibuild :-/ - def jobhistory(repository_name:, arch_name:, package_name: nil, filter: { limit: 100, start_epoch: nil, end_epoch: nil, code: [] }) + def jobhistory(repository_name:, arch_name:, package_name: name, filter: { limit: 100, start_epoch: nil, end_epoch: nil, code: [] }) Backend::Api::BuildResults::JobHistory.for_package(project_name: project, - package_name: package_name.presence ? package_name : name, + package_name: package_name, repository_name: repository_name, arch_name: arch_name, filter: filter) From 91f2fc712a884a3f40d36e0439581a1f4910dcc4 Mon Sep 17 00:00:00 2001 From: Eduardo Navarro Date: Wed, 13 Nov 2019 15:42:29 +0100 Subject: [PATCH 2/2] Add optional project_name parameter in jobhistory This way the job history of the project of the actual package is shown, instead of the project that a package inherits. Fixes #6790. Co-authored-by: David Kang --- .../app/controllers/webui/packages/job_history_controller.rb | 2 +- src/api/app/models/package.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/app/controllers/webui/packages/job_history_controller.rb b/src/api/app/controllers/webui/packages/job_history_controller.rb index a1d51cd3ac4..7ad35fd72c6 100644 --- a/src/api/app/controllers/webui/packages/job_history_controller.rb +++ b/src/api/app/controllers/webui/packages/job_history_controller.rb @@ -7,7 +7,7 @@ class JobHistoryController < WebuiController before_action :set_architecture def index - @jobshistory = @package.jobhistory(repository_name: @repository.name, arch_name: @architecture.name, package_name: @package_name) + @jobshistory = @package.jobhistory(repository_name: @repository.name, arch_name: @architecture.name, package_name: @package_name, project_name: @project.name) end private diff --git a/src/api/app/models/package.rb b/src/api/app/models/package.rb index dba82691e8b..f16d3f4761c 100644 --- a/src/api/app/models/package.rb +++ b/src/api/app/models/package.rb @@ -915,8 +915,8 @@ def buildresult(prj = project, show_all = false) end # FIXME: That you can overwrite package_name is rather confusing, but needed because of multibuild :-/ - def jobhistory(repository_name:, arch_name:, package_name: name, filter: { limit: 100, start_epoch: nil, end_epoch: nil, code: [] }) - Backend::Api::BuildResults::JobHistory.for_package(project_name: project, + def jobhistory(repository_name:, arch_name:, package_name: name, project_name: project.name, filter: { limit: 100, start_epoch: nil, end_epoch: nil, code: [] }) + Backend::Api::BuildResults::JobHistory.for_package(project_name: project_name, package_name: package_name, repository_name: repository_name, arch_name: arch_name,