[ARVADOS] updated: 887b0d278120e7df342fb2f99c5352fbd7c39034

[Git user]

Summary of changes:
 apps/workbench/app/controllers/application_controller.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

       via  887b0d278120e7df342fb2f99c5352fbd7c39034 (commit)
      from  e2cfa981e8a18453b4eff1edcf79497dc648fe40 (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 887b0d278120e7df342fb2f99c5352fbd7c39034
Author: radhika <radhika at curoverse.com>
Date:   Wed Nov 2 12:31:58 2016 -0400

    10310: fix :show method

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 46dad10..4d98a56 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -215,13 +215,7 @@ class ApplicationController < ActionController::Base
   end
 
   def ensure_arvados_api_exists
-    if params['action'] == 'show'
-      method = :get
-    else
-      method = params['action'].to_sym
-    end
-
-    exists = arvados_api_exists params['controller'].to_sym, method
+    exists = arvados_api_exists params['controller'].to_sym, params['action'].to_sym
     if !exists
       @errors = ["#{params['action']} method is not supported for #{params['controller']}"]
       return render_error(status: 404)
@@ -884,6 +878,7 @@ class ApplicationController < ActionController::Base
   def recent_processes lim
     lim = 12 if lim.nil?
 
+    procs = {}
     if arvados_api_exists :pipeline_instances, :index
       cols = %w(uuid owner_uuid created_at modified_at pipeline_template_uuid name state started_at finished_at)
       pipelines = PipelineInstance.select(cols).limit(lim).order(["created_at desc"])
@@ -891,7 +886,6 @@ class ApplicationController < ActionController::Base
     end
 
     crs = ContainerRequest.limit(lim).order(["created_at desc"]).filter([["requesting_container_uuid", "=", nil]])
-    procs = {}
     crs.results.each { |c| procs[c] = c.created_at }
 
     Hash[procs.sort_by {|key, value| value}].keys.reverse.first(lim)

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


hooks/post-receive
--