[ARVADOS] updated: baff57fcd7fa5a2179f0ba36558440dcca18c385

[git at public.curoverse.com]

Summary of changes:
 .../pipeline_instances/_running_component.html.erb | 32 ++++++++++++----------
 .../_show_components_running.html.erb              |  2 +-
 .../test/integration/anonymous_access_test.rb      |  4 +--
 3 files changed, 19 insertions(+), 19 deletions(-)

       via  baff57fcd7fa5a2179f0ba36558440dcca18c385 (commit)
      from  2cda4fc683d0549fc80b15155f36cf2637180240 (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 baff57fcd7fa5a2179f0ba36558440dcca18c385
Author: radhika <radhika at curoverse.com>
Date:   Fri Dec 4 13:48:48 2015 -0500

    7753: show the job Log link in the component panel header only when it is a pipeline_instance display; hide it for job#show

diff --git a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
index 6a24f1f..cb27f1c 100644
--- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
@@ -19,26 +19,28 @@
 
         <% if current_job %>
           <%# column offset 4 %>
-          <% if current_job[:state].in? ["Complete", "Failed", "Cancelled"] %>
-            <div class="col-md-1">
-            <% if current_job[:log] %>
-                <% logCollection = Collection.find? current_job[:log] %>
-                <% if logCollection %>
+          <% if(pipeline_display rescue nil) %>
+            <% if current_job[:state].in? ["Complete", "Failed", "Cancelled"] %>
+              <div class="col-md-1">
+              <% if current_job[:log] %>
+                  <% logCollection = Collection.find? current_job[:log] %>
+                  <% if logCollection %>
+                    <%= link_to "Log", job_path(current_job[:uuid], anchor: "Log") %>
+                  <% else %>
+                    Log unavailable
+                  <% end %>
+              <% end %>
+              </div>
+            <% elsif current_job[:state] == "Running" %>
+              <div class="col-md-1">
+                <% job = Job.find? current_job[:uuid] %>
+                <% if job %>
                   <%= link_to "Log", job_path(current_job[:uuid], anchor: "Log") %>
                 <% else %>
                   Log unavailable
                 <% end %>
+              </div>
             <% end %>
-            </div>
-          <% elsif current_job[:state] == "Running" %>
-            <div class="col-md-1">
-              <% job = Job.find? current_job[:uuid] %>
-              <% if job %>
-                <%= link_to "Log", job_path(current_job[:uuid], anchor: "Log") %>
-              <% else %>
-                Log unavailable
-              <% end %>
-            </div>
           <% end %>
 
           <%# column offset 5 %>
diff --git a/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
index 566e3d7..4343f2e 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
@@ -97,5 +97,5 @@
 %>
 
 <% pipeline_jobs.each_with_index do |pj, i| %>
-  <%= render partial: 'running_component', locals: {pj: pj, i: i, expanded: false} %>
+  <%= render partial: 'running_component', locals: {pj: pj, i: i, expanded: false, pipeline_display: true} %>
 <% end %>
diff --git a/apps/workbench/test/integration/anonymous_access_test.rb b/apps/workbench/test/integration/anonymous_access_test.rb
index f962821..d58a031 100644
--- a/apps/workbench/test/integration/anonymous_access_test.rb
+++ b/apps/workbench/test/integration/anonymous_access_test.rb
@@ -251,17 +251,15 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
           # Function.prototype.bind, which is used by job_log_graph.js.
           find(:xpath, "//a[@href='#Log']").click
           assert_text expect_log_text
-        else
-          assert_selector "a[href=\"/jobs/#{object['uuid']}#Log\"]", text: 'Log'
         end
       else
         assert_selector 'a[data-toggle="disabled"]', text: 'Log'
-        assert_text 'Log unavailable'
         assert_text 'Output data not available'
         assert_text object['job']
         if pipeline_page
           assert_no_text 'This pipeline was created from'  # template is not readable
           assert_no_selector 'a', text: object['components']['foo']['job']['uuid']
+          assert_text 'Log unavailable'
         end
         find(:xpath, "//a[@href='#Log']").click
         assert_text 'Output data not available'

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


hooks/post-receive
--