[ARVADOS] updated: 64e9180b32bd158e157d3a11325d70b90ce1aeac

git at public.curoverse.com git at public.curoverse.com
Mon Feb 2 17:17:28 EST 2015


Summary of changes:
 apps/workbench/app/controllers/collections_controller.rb | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

       via  64e9180b32bd158e157d3a11325d70b90ce1aeac (commit)
      from  89d4aec69e1b6d8d1f687951f39d8e11f0e66ecf (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 64e9180b32bd158e157d3a11325d70b90ce1aeac
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Feb 2 17:15:55 2015 -0500

    2659: load @prov_svg outside of the 'if current_user' block so that an anonymous user can see the provenance graph when accessing publicly accessible collection.

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 7260f4f..85ea47d 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -180,7 +180,16 @@ class CollectionsController < ApplicationController
 
   def show
     return super if !@object
+
     @logs = []
+
+    if params["tab_pane"] == "Provenance_graph"
+      @prov_svg = ProvenanceHelper::create_provenance_graph(@object.provenance, "provenance_svg",
+                                                            {:request => request,
+                                                             :direction => :bottom_up,
+                                                             :combine_jobs => :script_only}) rescue nil
+    end
+
     if current_user
       if Keep::Locator.parse params["uuid"]
         @same_pdh = Collection.filter([["portable_data_hash", "=", @object.portable_data_hash]])
@@ -216,12 +225,6 @@ class CollectionsController < ApplicationController
           .results.any?
         @search_sharing = search_scopes
 
-        if params["tab_pane"] == "Provenance_graph"
-          @prov_svg = ProvenanceHelper::create_provenance_graph(@object.provenance, "provenance_svg",
-                                                                {:request => request,
-                                                                  :direction => :bottom_up,
-                                                                  :combine_jobs => :script_only}) rescue nil
-        end
         if params["tab_pane"] == "Used_by"
           @used_by_svg = ProvenanceHelper::create_provenance_graph(@object.used_by, "used_by_svg",
                                                                    {:request => request,

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list