2883: Styling column widths so they don't jump around when filters are turned

[arvados.git] / apps / workbench / app / views / folders / _choose.html.erb

diff --git a/apps/workbench/app/views/folders/_choose.html.erb b/apps/workbench/app/views/folders/_choose.html.erb
index d0fa73b881cb8f086720c730a613b15d5e0cf937..c27d669e2b65ea4c353c8e303c731b02345956ef 100644 (file)
--- a/apps/workbench/app/views/folders/_choose.html.erb
+++ b/apps/workbench/app/views/folders/_choose.html.erb
@@ -9,16 +9,23 @@
 
       <div class="modal-body">
         <div class="container-fluid arv-folder-list selectable-container" style="height: 15em; overflow-y: scroll">
-          <% [[@my_folder_tree, 'My folders'],
-             [@shared_folder_tree, 'Shared with me']].each do |tree, label| %>
-            <div class="row">
-              <i class="fa fa-fw fa-folder-open-o"></i> <%= label %>
-            </div>
+          <% [@my_folder_tree, @shared_folder_tree].each do |tree| %>
             <% tree.each do |foldernode| %>
-              <div class="<%= 'selectable' if !params[:editable] || foldernode[:object].editable? %> folder row" style="padding-left: <%= 1 + foldernode[:depth] %>em;" data-object-uuid="<%= foldernode[:object].uuid %>">
-                <i class="fa fa-fw fa-folder-o"></i>
-                <%= foldernode[:object].friendly_link_name || 'New folder' %>
-              </div>
+              <% if foldernode[:object].is_a? String %>
+                <div class="row" style="padding-left: <%= 1 + foldernode[:depth] %>em;">
+                  <i class="fa fa-fw fa-folder-open-o"></i>
+                  <%= foldernode[:object] %>
+                </div>
+              <% else %>
+                <div class="<%= 'selectable folder' if !params[:editable] || foldernode[:object].editable? %> row" style="padding-left: <%= 1 + foldernode[:depth] %>em;" data-object-uuid="<%= foldernode[:object].uuid %>">
+                  <i class="fa fa-fw fa-folder-o"></i>
+                  <% if foldernode[:object].uuid == current_user.uuid %>
+                    My Folders
+                  <% else %>
+                    <%= foldernode[:object].friendly_link_name || 'New folder' %>
+                  <% end %>
+                </div>
+              <% end %>
             <% end %>
           <% end %>
         </div>