[ARVADOS] updated: b8b693c0c8db03a251d51eb42b46ea1faf719b1a

[git at public.curoverse.com]

Summary of changes:
 .../api_client_authorizations_controller.rb        |    2 +-
 .../controllers/pipeline_templates_controller.rb   |    5 +----
 apps/workbench/app/models/arvados_api_client.rb    |    2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

       via  b8b693c0c8db03a251d51eb42b46ea1faf719b1a (commit)
      from  e5a9f73847bab2d27a9423bb1c237063f7739bef (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 b8b693c0c8db03a251d51eb42b46ea1faf719b1a
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Mar 21 16:02:03 2014 -0400

    Fixed pipeline templates page that was broken by paging merge.

diff --git a/apps/workbench/app/controllers/api_client_authorizations_controller.rb b/apps/workbench/app/controllers/api_client_authorizations_controller.rb
index 4a1256d..24b4ae3 100644
--- a/apps/workbench/app/controllers/api_client_authorizations_controller.rb
+++ b/apps/workbench/app/controllers/api_client_authorizations_controller.rb
@@ -7,7 +7,7 @@ class ApiClientAuthorizationsController < ApplicationController
     filtered = m.to_ary.reject do |x|
       x.api_client_id == 0 or (x.expires_at and x.expires_at < Time.now) rescue false
     end
-    ArvadosApiClient.patch_paging_vars(filtered, items_available, offset, limit)
+    ArvadosApiClient::patch_paging_vars(filtered, items_available, offset, limit)
     @objects = ArvadosResourceList.new(ApiClientAuthorization)
     @objects.results= filtered
     super
diff --git a/apps/workbench/app/controllers/pipeline_templates_controller.rb b/apps/workbench/app/controllers/pipeline_templates_controller.rb
index 98101b5..5173d4e 100644
--- a/apps/workbench/app/controllers/pipeline_templates_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_templates_controller.rb
@@ -1,10 +1,7 @@
 class PipelineTemplatesController < ApplicationController
   
   def show
-    @objects = [] 
-    PipelineInstance.where(pipeline_template_uuid: @object.uuid).each do |pipeline|
-      @objects.push(pipeline)
-    end
+    @objects = PipelineInstance.where(pipeline_template_uuid: @object.uuid)
     super
   end
 
diff --git a/apps/workbench/app/models/arvados_api_client.rb b/apps/workbench/app/models/arvados_api_client.rb
index 0672742..2f83a41 100644
--- a/apps/workbench/app/models/arvados_api_client.rb
+++ b/apps/workbench/app/models/arvados_api_client.rb
@@ -109,7 +109,7 @@ class ArvadosApiClient
   def unpack_api_response(j, kind=nil)
     if j.is_a? Hash and j[:items].is_a? Array and j[:kind].match(/(_list|List)$/)
       ary = j[:items].collect { |x| unpack_api_response x, j[:kind] }
-      ArvadosApiClient.patch_paging_vars(ary, j[:items_available], j[:offset], j[:limit])
+      ArvadosApiClient::patch_paging_vars(ary, j[:items_available], j[:offset], j[:limit])
     elsif j.is_a? Hash and (kind || j[:kind])
       oclass = self.kind_class(kind || j[:kind])
       if oclass

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


hooks/post-receive
--