11710: fix typo in finding children

diff --git a/apps/workbench/app/models/container_work_unit.rb b/apps/workbench/app/models/container_work_unit.rb
index 68f8e30093cc0b6d6c14e8d8f94f5e68d7303bc0..ed341967901369a94f03a5134074633597854527 100644 (file)
--- a/apps/workbench/app/models/container_work_unit.rb
+++ b/apps/workbench/app/models/container_work_unit.rb
@@ -16,20 +16,16 @@ class ContainerWorkUnit < ProxyWorkUnit
   def children
     return @my_children if @my_children
 
-    container_uuid = nil
-    container_uuid = if @proxied.is_a?(Container) then uuid else get(:container_uuid) end
-
     items = []
+    container_uuid = if @proxied.is_a?(Container) then uuid else get(:container_uuid) end
     if container_uuid
-      my_children = @child_proxies
       cols = ContainerRequest.columns.map(&:name) - %w(id updated_at mounts)
-      my_children = ContainerRequest.select(cols).where(requesting_container_uuid: container_uuid).results if !my_children
+      my_children = @child_proxies || ContainerRequest.select(cols).where(requesting_container_uuid: container_uuid).results if !my_children
       my_child_containers = my_children.map(&:container_uuid).compact.uniq
       grandchildren = {}
       my_child_containers.each { |c| grandchildren[c] = []} if my_child_containers.any?
-
       reqs = ContainerRequest.select(cols).where(requesting_container_uuid: my_child_containers).results if my_child_containers.any?
-      reqs.each {|cr| grandchildren[cr.request_container_uuid] << cr} if reqs
+      reqs.each {|cr| grandchildren[cr.requesting_container_uuid] << cr} if reqs
 
       my_children.each do |cr|
         items << cr.work_unit(cr.name || 'this container', child_objects=grandchildren[cr.container_uuid])