Merge pull request OSC#1317 from OSC/bugfix/shell-button

fix shell dropdown menu to correctly redirect to the shell app
ryanbcox · Aug 4, 2021 · 0c35260 · 0c35260
2 parents 6e7af82 + e612a2d
commit 0c35260
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/apps/dashboard/app/views/files/_shell_dropdown.html.erb b/apps/dashboard/app/views/files/_shell_dropdown.html.erb
@@ -6,22 +6,19 @@
   <% if Configuration.login_clusters.count > 0 %>
     <button type="button" class="btn btn-sm btn-outline-dark dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
     <ul class="dropdown-menu" x-placement="right-start" id="shell-dropdown-items">
-      <% Configuration.login_clusters.each{ |cluster| %>
+      <% Configuration.login_clusters.each do |cluster| %>
         <%=
-          # <li>
-          #   <a href="" title="" target="_blank" class="dropdown-item"></a>
-          # </li>
           tag.li(
             tag.a(
               "#{cluster.metadata.title || cluster.id.to_s.titleize}",
-              href: OodAppkit::Urls::Shell.new(base_url: root_path).url(host: cluster.login.host, path: @path.to_s),
+              href: OodAppkit.shell.url(host: cluster.login.host, path: @path.to_s),
               title: "#{cluster.metadata.title || cluster.id.to_s.titleize}",
               target: '_blank',
               class: 'dropdown-item'
             )
           )
         %>
-      <% } %>
+      <% end %>
     </ul>
   <% end %>
 </div>