[ARVADOS] updated: 7a54e370484b9adb7479fde69665d4adcbb7331f
git at public.curoverse.com
git at public.curoverse.com
Mon Mar 30 15:45:08 EDT 2015
Summary of changes:
apps/workbench/app/views/layouts/body.html.erb | 4 +++-
apps/workbench/config/application.default.yml | 2 +-
.../test/integration/application_layout_test.rb | 18 ++++++++++++++++++
3 files changed, 22 insertions(+), 2 deletions(-)
via 7a54e370484b9adb7479fde69665d4adcbb7331f (commit)
from b0a3771f2110b691882226c559eab736ab9aa34d (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 7a54e370484b9adb7479fde69665d4adcbb7331f
Author: Radhika Chippada <radhika at curoverse.com>
Date: Mon Mar 30 15:42:48 2015 -0400
5493: do not show "Public pipelines and datasets" link in help menu if config parameter is not set.
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 1f91e67..526513d 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -123,7 +123,9 @@
<i class="fa fa-fw fa-info"></i> Getting Started ...
<% end %>
</li>
- <li><%= link_to raw('<i class="fa fa-book fa-fw"></i> Public Pipelines and Datasets'), "#{Rails.configuration.arvados_wikisite}/projects/arvados/wiki/Public_Pipelines_and_Datasets", target: "_blank" %></li>
+ <% if Rails.configuration.arvados_public_data_doc_url %>
+ <li><%= link_to raw('<i class="fa fa-book fa-fw"></i> Public Pipelines and Datasets'), "#{Rails.configuration.arvados_public_data_doc_url}", target: "_blank" %></li>
+ <% end %>
<li><%= link_to raw('<i class="fa fa-book fa-fw"></i> Tutorials and User guide'), "#{Rails.configuration.arvados_docsite}/user", target: "_blank" %></li>
<li><%= link_to raw('<i class="fa fa-book fa-fw"></i> API Reference'), "#{Rails.configuration.arvados_docsite}/api", target: "_blank" %></li>
<li><%= link_to raw('<i class="fa fa-book fa-fw"></i> SDK Reference'), "#{Rails.configuration.arvados_docsite}/sdk", target: "_blank" %></li>
diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 0b8f36d..40c0bfe 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -131,7 +131,7 @@ common:
arvados_insecure_https: true
activation_contact_link: mailto:info at arvados.org
arvados_docsite: http://doc.arvados.org
- arvados_wikisite: http://arvados.org
+ arvados_public_data_doc_url: http://arvados.org/projects/arvados/wiki/Public_Pipelines_and_Datasets
arvados_theme: default
show_user_agreement_inline: false
secret_token: ~
diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index 51a4fb2..fe0c012 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -164,4 +164,22 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
end
assert_text 'Active pipelines' # seeing dashboard now
end
+
+ test "test arvados_public_data_doc_url config unset" do
+ Rails.configuration.arvados_public_data_doc_url = false
+
+ visit page_with_token('active')
+ within '.navbar-fixed-top' do
+ find('.help-menu > a').click
+
+ assert_no_selector 'a', text:'Public Pipelines and Datasets'
+
+ assert_selector 'a', text:'Getting Started ...'
+ assert page.has_link?('Tutorials and User guide'), 'No link - Tutorials and User guide'
+ assert page.has_link?('API Reference'), 'No link - API Reference'
+ assert page.has_link?('SDK Reference'), 'No link - SDK Reference'
+ assert page.has_link?('Show version / debugging info ...'), 'No link - Show version / debugging info'
+ assert page.has_link?('Report a problem ...'), 'No link - Report a problem'
+ end
+ end
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list