[ARVADOS] updated: 2d10f584cafa6348a933a5714ec8a7744957005d

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/application_controller.rb     | 12 ------------
 .../app/views/pipeline_instances/_show_recent.html.erb       |  2 +-
 apps/workbench/app/views/pipeline_instances/index.html.erb   |  2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

       via  2d10f584cafa6348a933a5714ec8a7744957005d (commit)
      from  16527c125c469451d810951ded0860294950a1f0 (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 2d10f584cafa6348a933a5714ec8a7744957005d
Author: radhika <radhika at curoverse.com>
Date:   Fri Nov 7 19:14:05 2014 -0500

    4024: scrolling + search works now that filters are included in next page href.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 24bacf3..3fa76b1 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -170,18 +170,6 @@ class ApplicationController < ActionController::Base
     if params[:partial]
       respond_to do |f|
         f.json {
-=begin
-          if @filters.andand.any?
-            search_filters = @filters.select do |attr,op,val|
-              op == 'ilike' and !val.nil? and !val.eql?('%%')
-            end
-          end
-          if !search_filters || !search_filters.any?  # no search filter was used
-            @next_page_href = next_page_href(partial: params[:partial], filters: @filters.to_json)
-          else
-            @next_page_href = nil
-          end
-=end
           @next_page_href = next_page_href(partial: params[:partial], filters: @filters.to_json)
           render json: {
             content: render_to_string(partial: "show_#{params[:partial]}.html", formats: [:html]),
diff --git a/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb b/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb
index 288fe13..e1a7cea 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb
@@ -28,7 +28,7 @@
     </tr>
   </thead>
 
-  <tbody data-infinite-scroller="recent-pipeline-instances-scroll"
+  <tbody data-infinite-scroller="#recent-pipeline-instances" id="recent-pipeline-instances"
          data-infinite-content-href="<%= url_for partial: :recent_rows %>" >
   </tbody>
 
diff --git a/apps/workbench/app/views/pipeline_instances/index.html.erb b/apps/workbench/app/views/pipeline_instances/index.html.erb
index 10dfec5..901dbbc 100644
--- a/apps/workbench/app/views/pipeline_instances/index.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/index.html.erb
@@ -8,7 +8,7 @@
     <div class="input-group">
       <input type="text" class="form-control filterable-control recent-pipeline-instances-filterable-control"
              placeholder="Search pipeline instances"
-             data-filterable-target="table.arv-recent-pipeline-instances tbody"/>
+             data-filterable-target="#recent-pipeline-instances"/>
        <span class="input-group-btn">
          <%= button_tag(class: 'btn btn-info') do %>
          <span class="glyphicon glyphicon-search"></span>

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


hooks/post-receive
--