[ARVADOS] updated: e5658ecaa629572c5fe8e459f4f0630f28a4317f

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/helpers/application_helper.rb         | 2 +-
 apps/workbench/app/views/application/_content.html.erb   | 5 ++++-
 apps/workbench/test/integration/anonymous_access_test.rb | 5 ++---
 3 files changed, 7 insertions(+), 5 deletions(-)

       via  e5658ecaa629572c5fe8e459f4f0630f28a4317f (commit)
       via  6529d3fbe051c591bc22809c2dea32a5ac9eac50 (commit)
      from  a12cd27da6ba612f2f6ca96cd1b398b3fa621a64 (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 e5658ecaa629572c5fe8e459f4f0630f28a4317f
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Sun Apr 12 17:29:28 2015 -0400

    5365: add back data-toggle along with link disabled for Log tab.

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 230e0a2..8922f33 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -294,7 +294,7 @@ module ApplicationHelper
     end
 
     if not object.andand.attribute_editable?(attr)
-      return link_to_arvados_object_if_readable(attrvalue, attrvalue)
+      return link_to_arvados_object_if_readable(attrvalue, attrvalue, friendly_name: true)
     end
 
     if dataclass
diff --git a/apps/workbench/app/views/application/_content.html.erb b/apps/workbench/app/views/application/_content.html.erb
index 99fbfaa..5e6211f 100644
--- a/apps/workbench/app/views/application/_content.html.erb
+++ b/apps/workbench/app/views/application/_content.html.erb
@@ -6,6 +6,7 @@
     <% pane_list.each_with_index do |pane, i| %>
       <% pane_name = (pane.is_a?(Hash) ? pane[:name] : pane) %>
 
+      <% data_toggle = "tab" %>
       <% tab_tooltip = "" %>
       <% link_disabled = "" %>
 
@@ -14,6 +15,7 @@
             if @object.log and !@object.log.empty?
               logCollection = Collection.find? @object.log
               if !logCollection
+                data_toggle = "disabled"
                 tab_tooltip = "Log data is not available"
                 link_disabled = "disabled"
               end
@@ -21,6 +23,7 @@
           elsif controller.model_class.to_s == 'PipelineInstance'
             log_uuids = [@object.uuid] + pipeline_jobs(@object).collect{|x|x[:job].andand[:uuid]}.compact
             if stderr_log_history(log_uuids, 1).empty?
+              data_toggle = "disabled"
               tab_tooltip = "Log data is not available"
               link_disabled = "disabled"
             end
@@ -31,7 +34,7 @@
       <li class="<%= 'active' if i==0 %> <%= link_disabled %>" data-toggle="tooltip" data-placement="top" title="<%=tab_tooltip%>">
         <a href="#<%= pane_name %>"
            id="<%= pane_name %>-tab"
-           data-toggle="tab"
+           data-toggle="<%= data_toggle %>"
            data-tab-history=true
            data-tab-history-update-url=true
            >
diff --git a/apps/workbench/test/integration/anonymous_access_test.rb b/apps/workbench/test/integration/anonymous_access_test.rb
index d00e20a..e891779 100644
--- a/apps/workbench/test/integration/anonymous_access_test.rb
+++ b/apps/workbench/test/integration/anonymous_access_test.rb
@@ -219,7 +219,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
         end
         assert_no_text 'Output data not available'
         assert_selector 'a[href="#Log"]', text: 'Log'
-        assert_no_selector 'a[class="disabled"]', text: 'Log'
+        assert_no_selector 'a[data-toggle="disabled"]', text: 'Log'
       else
         if pipeline_page
           assert_no_text 'This pipeline was created from'  # template is not readable
@@ -227,8 +227,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
         end
         assert_text 'Output data not available'
         assert_text object['job']
-        assert_selector 'a[href="#Log"]', text: 'Log'
-        assert_selector 'a[class="disabled"]', text: 'Log'
+        assert_selector 'a[data-toggle="disabled"]', text: 'Log'
       end
 
       click_link 'Log'

commit 6529d3fbe051c591bc22809c2dea32a5ac9eac50
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Sun Apr 12 09:06:38 2015 -0400

    5365: missed one updated signature update

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index d842e82..230e0a2 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -294,7 +294,7 @@ module ApplicationHelper
     end
 
     if not object.andand.attribute_editable?(attr)
-      return link_to_arvados_object_if_readable(attrvalue, attrvalue, attrvalue, true)
+      return link_to_arvados_object_if_readable(attrvalue, attrvalue)
     end
 
     if dataclass

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


hooks/post-receive
--