[ARVADOS] updated: f628e38317c20513cb73f81633d6a7c0663b8fd5

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/pipeline_instances_controller.rb      |  7 +++++++
 .../workbench/app/views/pipeline_instances/index.html.erb | 12 ++++++++++++
 services/api/script/crunch-dispatch.rb                    | 15 ++++++++++++---
 3 files changed, 31 insertions(+), 3 deletions(-)

       via  f628e38317c20513cb73f81633d6a7c0663b8fd5 (commit)
       via  7d197c6f7a676ac0e73f855fb4e6a3cd103dc55c (commit)
       via  1bb7352bf1425dc9acf028f863eaff1e5c207571 (commit)
       via  04c1723357282d0ef2890e570cfab84d35b99da4 (commit)
       via  b5ed27eba73076e416a285c7ea240fe0d8f52568 (commit)
       via  3e1ef3ebc922bd386566b6e75adf01003a2c3c96 (commit)
       via  023517001bf8efd7d44ab33d2a79d92d2ff30a30 (commit)
      from  008cec917d19fadc011fdb1d61d7b54ffe1d4dda (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 f628e38317c20513cb73f81633d6a7c0663b8fd5
Merge: 7d197c6 1bb7352
Author: radhika <radhika at curoverse.com>
Date:   Fri Nov 7 11:26:28 2014 -0500

    Merge branch 'master' into 4024-pipeline-instances-scroll


commit 7d197c6f7a676ac0e73f855fb4e6a3cd103dc55c
Author: radhika <radhika at curoverse.com>
Date:   Fri Nov 7 11:25:54 2014 -0500

    4024: add search filter to pipeline instances page.

diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index fa724b8..f5522ce 100644
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -287,6 +287,13 @@ class PipelineInstancesController < ApplicationController
   end
 
   def index
+    if params[:search].andand.length.andand > 0
+      @select ||= PipelineInstance.columns.map(&:name)
+      base_search = PipelineInstance.select(@select)
+      @objects = base_search.where(any: ['contains', params[:search]]).
+                              uniq { |pi| pi.uuid }
+    end
+
     @limit = 20
     super
   end
diff --git a/apps/workbench/app/views/pipeline_instances/index.html.erb b/apps/workbench/app/views/pipeline_instances/index.html.erb
index 4b73bd4..ee6f0bd 100644
--- a/apps/workbench/app/views/pipeline_instances/index.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/index.html.erb
@@ -3,6 +3,18 @@
   <%= submit_tag 'Compare 2 or 3 selected', {class: 'btn btn-primary', disabled: true, style: 'display: none'} %>
    
 <% end rescue nil %>
+
+  <%= form_tag pipeline_instances_path, method: 'get', remote: true, class: 'form-search' do %>
+    <div class="input-group">
+      <input type="text" class="form-control filterable-control" placeholder="Search pipeline instances" 
+             data-filterable-target="table.arv-recent-pipeline-instances tbody"/>
+       <span class="input-group-btn">
+         <%= button_tag(class: 'btn btn-info') do %>
+         <span class="glyphicon glyphicon-search"></span>
+         <% end %>
+       </span>
+    </div>
+  <% end %>
 <% end %>
 
 <%= render file: 'application/index.html.erb', locals: local_assigns %>

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


hooks/post-receive
--