[ARVADOS] updated: 1.1.3-78-g6a5762b

[Git user]

Summary of changes:
 .../app/controllers/work_units_controller.rb       | 13 +++++++---
 .../views/work_units/_show_all_processes.html.erb  | 29 +++++++++++++---------
 2 files changed, 26 insertions(+), 16 deletions(-)

       via  6a5762b6515b92ec57a2f0a5583346ca5dab2dd6 (commit)
      from  60f89f0b235ac6b2729166e4bf4c04da3b9c1670 (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 6a5762b6515b92ec57a2f0a5583346ca5dab2dd6
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Feb 23 14:31:40 2018 -0500

    12315: Add abstract show_children query parameter
    
    Can't use requesting_container_uuid filter directly because it breaks
    query of jobs and pipelines.  Add abstract show_children query
    parameter.  Default is to hide children processes.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/app/controllers/work_units_controller.rb b/apps/workbench/app/controllers/work_units_controller.rb
index 1e57e7c..dc10d97 100644
--- a/apps/workbench/app/controllers/work_units_controller.rb
+++ b/apps/workbench/app/controllers/work_units_controller.rb
@@ -23,14 +23,19 @@ class WorkUnitsController < ApplicationController
       pipelines = PipelineInstance.limit(@limit).order(["created_at desc"]).filter(filters)
     end
 
-    # get next page of jobs
-    if Job.api_exists?(:index)
-      filters = @filters + [["uuid", "is_a", ["arvados#job"]]]
-      jobs = Job.limit(@limit).order(["created_at desc"]).filter(filters)
+    if params[:show_children]
+      # get next page of jobs
+      if Job.api_exists?(:index)
+        filters = @filters + [["uuid", "is_a", ["arvados#job"]]]
+        jobs = Job.limit(@limit).order(["created_at desc"]).filter(filters)
+      end
     end
 
     # get next page of container_requests
     filters = @filters + [["uuid", "is_a", ["arvados#containerRequest"]]]
+    if !params[:show_children]
+     filters << ["requesting_container_uuid", "=", nil]
+    end
     crs = ContainerRequest.limit(@limit).order(["created_at desc"]).filter(filters)
     @objects = (jobs.to_a + pipelines.to_a + crs.to_a).sort_by(&:created_at).reverse.first(@limit)
 
diff --git a/apps/workbench/app/views/work_units/_show_all_processes.html.erb b/apps/workbench/app/views/work_units/_show_all_processes.html.erb
index 99d26b6..c06a88e 100644
--- a/apps/workbench/app/views/work_units/_show_all_processes.html.erb
+++ b/apps/workbench/app/views/work_units/_show_all_processes.html.erb
@@ -2,19 +2,24 @@
 
 SPDX-License-Identifier: AGPL-3.0 %>
 
-<div class="form-group pull-right">
-  <input type="text" class="form-control filterable-control recent-all-processes-filterable-control"
-         placeholder="Search all processes"
-         data-filterable-target="#all-processes-scroll"
-         value="<%= params[:search] %>" />
-  <label>
-    <input id="ExcludeChildProcs" type="checkbox" class="filterable-control"
-           data-on-value="{"filters":[["requesting_container_uuid","=",null]]}"
-           data-off-value="{}"
-           data-filterable-target="#all-processes-scroll" />
-    exclude child processes
-  </label>
+<div class="pull-right">
+  <div class="form-group">
+    <input type="text" class="form-control filterable-control recent-all-processes-filterable-control"
+           placeholder="Search all processes"
+           data-filterable-target="#all-processes-scroll"
+           value="<%= params[:search] %>" size="40" />
+  </div>
+  <div class="checkbox">
+    <label>
+      <input id="ExcludeChildProcs" type="checkbox" class="filterable-control"
+	     data-on-value="{"show_c1hildren":true}"
+	     data-off-value="{}"
+	     data-filterable-target="#all-processes-scroll" />
+      Show child processes
+    </label>
+  </div>
 </div>
+
 <div>
   <div>
     <div>

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


hooks/post-receive
--