[ARVADOS] created: 1.1.3-94-g6c99962

[Git user]

        at  6c99962c33249081e0a61aa9e843e09171784b26 (commit)


commit 6c99962c33249081e0a61aa9e843e09171784b26
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Feb 14 11:22:57 2018 -0500

    13037: Add hidden api_token to Composer button to skip extra login
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 4112b22..8822d5c 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -330,4 +330,24 @@ div.awesomplete {
 .awesomplete > ul {
     max-height: 410px;
     overflow-y: auto;
-}
\ No newline at end of file
+}
+
+.dropdown-menu > li > form > button {
+    display: block;
+    padding: 3px 20px;
+    clear: both;
+    font-weight: normal;
+    line-height: 1.428571429;
+    color: #333333;
+    white-space: nowrap;
+    cursor: pointer;
+    text-decoration: none;
+    background: transparent;
+    border-style: none;
+}
+
+.dropdown-menu > li > form > button:hover {
+    text-decoration: none;
+    color: #262626;
+    background-color: #f5f5f5;
+}
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 174e35f..f4be7ca 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -74,9 +74,12 @@ SPDX-License-Identifier: AGPL-3.0 %>
                 <li role="menuitem"><a href="/projects/<%=current_user.uuid%>" role="menuitem"><i class="fa fa-lg fa-home fa-fw"></i> Home project </a></li>
                   <% if Rails.configuration.composer_url %>
                     <li role="menuitem">
-                      <%= link_to Rails.configuration.composer_url, role: 'menu-item' do %>
-                      <i class="fa fa-lg fa-share-alt fa-fw"></i> Workflow Composer
-                  <% end %>
+		      <form action="<%= Rails.configuration.composer_url %>" method="GET">
+		        <input type="hidden" name="api_token" value="<%= Thread.current[:arvados_api_token] %>" />
+			<button role="menuitem" type="submit">
+			  <i class="fa fa-lg fa-share-alt fa-fw"></i> Workflow Composer
+			</button>
+		      </form>
                     </li>
                   <% end %>
                 <li role="menuitem">

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


hooks/post-receive
--