[ARVADOS] updated: 3d60a5dcfb6765b223d224dda3980226230464d0

[Git user]

Summary of changes:
 apps/workbench/app/models/job_work_unit.rb         | 28 ++++++++++++++++++++
 apps/workbench/app/models/proxy_work_unit.rb       | 30 +---------------------
 .../app/views/work_unit/_component_detail.html.erb |  4 +++
 apps/workbench/test/integration/jobs_test.rb       |  2 +-
 4 files changed, 34 insertions(+), 30 deletions(-)

       via  3d60a5dcfb6765b223d224dda3980226230464d0 (commit)
      from  8a56164a8a9d3c7b3b58df77d1e5aa3f1d6cad12 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 3d60a5dcfb6765b223d224dda3980226230464d0
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 3 16:52:06 2016 -0400

    8876: display "no process has been submitted" when a child uuid is not presented.

diff --git a/apps/workbench/app/models/job_work_unit.rb b/apps/workbench/app/models/job_work_unit.rb
index 49f490d..80dea19 100644
--- a/apps/workbench/app/models/job_work_unit.rb
+++ b/apps/workbench/app/models/job_work_unit.rb
@@ -23,6 +23,34 @@ class JobWorkUnit < ProxyWorkUnit
     self.my_children = items
   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 child_summary
     if children.any?
       super
diff --git a/apps/workbench/app/models/proxy_work_unit.rb b/apps/workbench/app/models/proxy_work_unit.rb
index 5d3ecab..1a24cd5 100644
--- a/apps/workbench/app/models/proxy_work_unit.rb
+++ b/apps/workbench/app/models/proxy_work_unit.rb
@@ -145,38 +145,10 @@ class ProxyWorkUnit < WorkUnit
     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 runtime_constraints
     get(:runtime_constraints)
   end
 
-  def docker_image
-    get(:docker_image_locator)
-  end
-
-  def nondeterministic
-    get(:nondeterministic)
-  end
-
   def priority
     get(:priority)
   end
@@ -194,7 +166,7 @@ class ProxyWorkUnit < WorkUnit
   end
 
   def title
-    "work unit"
+    "process"
   end
 
   def has_unreadable_children
diff --git a/apps/workbench/app/views/work_unit/_component_detail.html.erb b/apps/workbench/app/views/work_unit/_component_detail.html.erb
index d68273a..6f06825 100644
--- a/apps/workbench/app/views/work_unit/_component_detail.html.erb
+++ b/apps/workbench/app/views/work_unit/_component_detail.html.erb
@@ -1,6 +1,9 @@
       <div class="container">
         <div class="row">
           <div class="col-md-5">
+            <% if current_obj.uuid.nil? %>
+              No <%= current_obj.title %> has been submitted yet.
+            <% else %>
             <table>
               <% [:uuid, :modified_by_user_uuid, :created_at, :started_at, :finished_at, :output, :priority].each do |k| %>
                 <% val = current_obj.send(k) if current_obj.respond_to?(k) %>
@@ -25,6 +28,7 @@
                 </tr>
                 <% end %>
               <% end %>
+            <% end %>
             </table>
           </div>
           <div class="col-md-6">
diff --git a/apps/workbench/test/integration/jobs_test.rb b/apps/workbench/test/integration/jobs_test.rb
index be6a83d..e39d6f4 100644
--- a/apps/workbench/test/integration/jobs_test.rb
+++ b/apps/workbench/test/integration/jobs_test.rb
@@ -101,7 +101,7 @@ class JobsTest < ActionDispatch::IntegrationTest
       if expect_options
         assert_text 'supplied_script_version: master'
       else
-        assert_no_text 'supplied_script_version: (none)'
+        assert_no_text 'supplied_script_version'
       end
 
       assert_triggers_dom_event 'shown.bs.modal' do

-----------------------------------------------------------------------


hooks/post-receive
--