From 6f4a1bcdf7fcddcad49769adecb1f9a4c459b822 Mon Sep 17 00:00:00 2001
From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Tue, 28 Jan 2014 10:45:54 -0500
Subject: [PATCH] Work in progress

---
 apps/workbench/app/controllers/collections_controller.rb  | 6 +-----
 .../app/controllers/arvados/v1/collections_controller.rb  | 8 +++++---
 services/api/config/routes.rb                             | 1 +
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index bf7dde0a0e..2508d3d49a 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -1,11 +1,7 @@
 class CollectionsController < ApplicationController
-  skip_before_filter :find_object_by_uuid, :only => [:graph]
+  skip_before_filter :find_object_by_uuid, :only => [:provenance]
   skip_before_filter :check_user_agreements, :only => [:show_file]
 
-  def graph
-    index
-  end
-
   def index
     if params[:search].andand.length.andand > 0
       tags = Link.where(any: ['contains', params[:search]])
diff --git a/services/api/app/controllers/arvados/v1/collections_controller.rb b/services/api/app/controllers/arvados/v1/collections_controller.rb
index d14de73bfe..918d499521 100644
--- a/services/api/app/controllers/arvados/v1/collections_controller.rb
+++ b/services/api/app/controllers/arvados/v1/collections_controller.rb
@@ -115,6 +115,7 @@ class Arvados::V1::CollectionsController < ApplicationController
           visited[uuid] = job
           script_param_edges(visited, job, "", job.script_parameters)
         end
+      end
     end
 
     Link.where(head_uuid: uuid, link_class: "provenance").each do |link|
@@ -126,14 +127,14 @@ class Arvados::V1::CollectionsController < ApplicationController
     gr
   end
 
-  def provenance 
+  def provenance(id)
     visited = {}
-    generate_provenance_edges(visited, @object.uuid)
+    generate_provenance_edges(visited, id[:uuid])
     visited
   end
 
-  protected
 
+  protected
   def find_object_by_uuid
     super
     if !@object and !params[:uuid].match(/^[0-9a-f]+\+\d+$/)
@@ -152,4 +153,5 @@ class Arvados::V1::CollectionsController < ApplicationController
       end
     end
   end
+
 end
diff --git a/services/api/config/routes.rb b/services/api/config/routes.rb
index 65b6a17587..e837e38617 100644
--- a/services/api/config/routes.rb
+++ b/services/api/config/routes.rb
@@ -96,6 +96,7 @@ Server::Application.routes.draw do
       match '/repositories/get_all_permissions' => 'repositories#get_all_permissions'
       get '/user_agreements/signatures' => 'user_agreements#signatures'
       post '/user_agreements/sign' => 'user_agreements#sign'
+      get '/collections/:uuid/provenance' => 'collections#provenance'
       resources :collections
       resources :links
       resources :nodes
-- 
2.39.5