Merge branch 'master' into 14965-arv-mount-py-three

[arvados.git] / apps / workbench / app / views / users / _virtual_machines.html.erb

diff --git a/apps/workbench/app/views/users/_virtual_machines.html.erb b/apps/workbench/app/views/users/_virtual_machines.html.erb
index c891b0c594af329b9f0a7790217596b11b0109fc..026f016f8cd7186ebcc6eb39e123ae0dcbb5e9dc 100644 (file)
--- a/apps/workbench/app/views/users/_virtual_machines.html.erb
+++ b/apps/workbench/app/views/users/_virtual_machines.html.erb
@@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
 <div id="manage_virtual_machines" class="panel-body">
   <p>
     For more information see <%= link_to raw('Arvados Docs &rarr; User Guide &rarr; VM access'),
-  "#{Rails.configuration.arvados_docsite}/user/getting_started/vm-login-with-webshell.html",
+  "#{Rails.configuration.Workbench.ArvadosDocsite}/user/getting_started/vm-login-with-webshell.html",
   target: "_blank"%>.
   </p>
 
@@ -68,7 +68,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
           <th> Host name </th>
           <th> Login name </th>
           <th> Command line </th>
-          <% if Rails.configuration.shell_in_a_box_url %>
+          <% if Rails.configuration.Services.WebShell.ExternalURL != URI("") %>
             <th> Web shell <span class="label label-info">beta</span></th>
           <% end %>
         </tr>
@@ -89,7 +89,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
                 <% end %>
               <% end %>
             </td>
-            <% if Rails.configuration.shell_in_a_box_url %>
+            <% if Rails.configuration.Services.WebShell.ExternalURL != URI("") %>
               <td>
                 <% @my_vm_logins[vm[:uuid]].andand.each do |login| %>
                   <%= link_to webshell_virtual_machine_path(vm, login: login), title: "Open a terminal session in your browser", class: 'btn btn-xs btn-default', target: "_blank" do %>