[ARVADOS] updated: cba838830cb4b47420573ba0187e0eebbc5b6f1f

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/application_controller.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

       via  cba838830cb4b47420573ba0187e0eebbc5b6f1f (commit)
      from  7b4fc9f10ad0df6e532299dbfc57ad4ba97ee015 (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 cba838830cb4b47420573ba0187e0eebbc5b6f1f
Author: radhika <radhika at curoverse.com>
Date:   Fri Nov 7 17:32:32 2014 -0500

    4024: comment out code that disables scrolling when search is used.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 7d7d555..24bacf3 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -170,16 +170,19 @@ 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])
+            @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]),
                                       next_page_href: @next_page_href

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


hooks/post-receive
--