X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6f6ce90eb894bde190fd7522cbec037fe61fc25c..07a2b2c0e743f36be03e746a7e265986db555d3e:/apps/workbench/app/views/projects/_show_dashboard.html.erb diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb index 00780c4089..713582654f 100644 --- a/apps/workbench/app/views/projects/_show_dashboard.html.erb +++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb @@ -12,24 +12,11 @@ SPDX-License-Identifier: AGPL-3.0 %> # fetch children of all the active crs in one call, if there are any active_crs = recent_crs.each {|cr| cr if (cr.priority.andand > 0 and cr.state != 'Final' and cr.container_uuid)} - active_cr_uuids = active_crs.map(&:uuid) - active_cr_containers = active_crs.map {|cr| cr.container_uuid}.compact.uniq - cr_children = {} - if active_cr_containers.any? - active_cr_containers.each { |c| cr_children[c] = []} - cols = ContainerRequest.columns.map(&:name) - %w(id updated_at mounts) - reqs = ContainerRequest.select(cols).where(requesting_container_uuid: active_cr_containers).results - reqs.each {|cr| cr_children[cr.requesting_container_uuid] << cr} if reqs - end wus = {} outputs = [] recent_procs.each do |p| - if p.uuid.in?(active_cr_uuids) - wu = p.work_unit(nil, child_objects=cr_children[p.container_uuid]) - else - wu = p.work_unit - end + wu = p.work_unit wus[p] = wu outputs << wu.outputs @@ -129,40 +116,20 @@ SPDX-License-Identifier: AGPL-3.0 %> <% else %>