X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c95e2762749ac2eb98fd7aec45134549174213d8..747aa7b4d080b4ea95bf7d6d8643c43e70966f33:/apps/workbench/app/controllers/folders_controller.rb diff --git a/apps/workbench/app/controllers/folders_controller.rb b/apps/workbench/app/controllers/folders_controller.rb index 94689ac484..8ebb1a34b1 100644 --- a/apps/workbench/app/controllers/folders_controller.rb +++ b/apps/workbench/app/controllers/folders_controller.rb @@ -61,14 +61,19 @@ class FoldersController < ApplicationController end sorted_paths = lambda do |tree, depth=0| paths = [] - tree.keys.sort_by { |ob| ob.friendly_link_name }.each do |ob| + tree.keys.sort_by { |ob| + ob.is_a?(String) ? ob : ob.friendly_link_name + }.each do |ob| paths << {object: ob, depth: depth} paths += sorted_paths.call tree[ob], depth+1 end paths end - @my_folder_tree = sorted_paths.call buildtree.call(children_of, 'me') - @shared_folder_tree = sorted_paths.call buildtree.call(children_of, false) + @my_folder_tree = + sorted_paths.call buildtree.call(children_of, 'me') + @shared_folder_tree = + sorted_paths.call({'Shared with me' => + buildtree.call(children_of, false)}) end def choose