[ARVADOS] updated: 33d948901f53f63eaa496831973d5666a9429062

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/projects_controller.rb | 11 ++++++++---
 apps/workbench/test/integration/projects_test.rb      |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

       via  33d948901f53f63eaa496831973d5666a9429062 (commit)
      from  1f7dbdb87eee28f7f357c025f7b5cd7d1ccc8c7a (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 33d948901f53f63eaa496831973d5666a9429062
Author: radhika <radhika at curoverse.com>
Date:   Fri Oct 17 15:39:28 2014 -0400

    4062: created_at filter in load_contents_objects

diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index b77a489..0a04f63 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -206,10 +206,12 @@ class ProjectsController < ApplicationController
         attr == 'created_at' and op == nextpage_operator
       end
       if @objects.any?
-        @next_page_filters += [['created_at',
-                                nextpage_operator,
-                                @objects.last.created_at]]
+        created_at_filter = ['created_at',
+                              nextpage_operator,
+                              @objects.last.created_at]
+        @next_page_filters << created_at_filter
         @next_page_href = url_for(partial: :contents_rows,
+                                  created_at_filter: created_at_filter,
                                   filters: @next_page_filters.to_json)
       else
         @next_page_href = nil
@@ -227,6 +229,9 @@ class ProjectsController < ApplicationController
   end
 
   def show
+    # The created_at filter is getting lost somewhere. Adding it again explicitly.
+    @filters << params['created_at_filter'] if params['created_at_filter']
+
     if !@object
       return render_not_found("object not found")
     end
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index b623490..67abcc9 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -547,7 +547,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
   [
     ['project with 10 pipelines', 10, 0],
     ['project with 200 jobs and 10 pipelines', 10, 200],
-    ['project with 25 pipelines', 25, 0],   # 20 is the page limit for this tab; hence two pages
+    ['project with 25 pipelines', 25, 0],
   ].each do |project_name, num_pipelines, num_jobs|
     test "scroll pipeline instances tab for #{project_name} with #{num_pipelines} pipelines and #{num_jobs} jobs" do
       headless = Headless.new

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


hooks/post-receive
--