Merge pull request #8713 from eduardoj/fix_6790_wrong_job_history

Fix wrong job history
openSUSE · Nov 14, 2019 · 535ab0c · 535ab0c
2 parents 13cd687 + 91f2fc7
commit 535ab0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 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
@@ -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
@@ -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: [] })
-    Backend::Api::BuildResults::JobHistory.for_package(project_name: project,
-                                                       package_name: package_name.presence ? package_name : name,
+  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,
                                                        filter: filter)