Merge branch '8650-container-work-unit' into 9318-dashboard-uses-work-units

Conflicts:
	apps/workbench/app/models/proxy_work_unit.rb

diff --cc apps/workbench/app/models/proxy_work_unit.rb
index 3f803b30d292584f7545e447ac3bce9a2411bc81,0342a403d82c3af63316a32bf1e024566a867450..d817bba3a4a7ef29d9cd6f0d90db48f5cf3455fd
--- 1/apps/workbench/app/models/proxy_work_unit.rb
--- 2/apps/workbench/app/models/proxy_work_unit.rb
+++ b/apps/workbench/app/models/proxy_work_unit.rb
@@@ -145,65 -145,10 +145,21 @@@ class ProxyWorkUnit < WorkUni
      end
    end
  
-   def parameters
-     get(:script_parameters)
-   end
- 
-   def repository
-     get(:repository)
-   end
- 
-   def script
-     get(:script)
-   end
- 
-   def script_version
-     get(:script_version)
-   end
- 
-   def supplied_script_version
-     get(:supplied_script_version)
-   end
- 
-   def docker_image
-     get(:docker_image_locator)
-   end
- 
-   def nondeterministic
-     get(:nondeterministic)
-   end
- 
-   def runtime_constraints
-     get(:runtime_constraints)
-   end
- 
-   def priority
-     get(:priority)
-   end
- 
-   def log_collection
-     get(:log)
-   end
- 
-   def output
-     get(:output)
+   def children
+     []
    end
  
-   def children
-     []
-   end
- 
 +  def outputs
 +    items = []
 +    children.each do |c|
 +      items << c.output if c.output
 +    end
 +    if !items.any?
 +      items << get(:output) if get(:output)
 +    end
 +    items
 +  end
 +
    def title
      "process"
    end

diff --cc apps/workbench/app/models/work_unit.rb
Simple merge