3499: Show Home at root of projects tree. closes #3517

diff --git a/apps/workbench/app/controllers/search_controller.rb b/apps/workbench/app/controllers/search_controller.rb
index 31c66638db69986ddb578740896f67f3be841351..6f209a5a9e0d11fc0a1a0fbaab0b6fe8b47834cc 100644 (file)
--- a/apps/workbench/app/controllers/search_controller.rb
+++ b/apps/workbench/app/controllers/search_controller.rb
@@ -6,7 +6,12 @@ class SearchController < ApplicationController
       @filters = @filters.select do |attr, operator, operand|
         not (attr == 'owner_uuid' and operator == '=')
       end
-      search_what = Group.find(params[:project_uuid])
+      # Special case for project_uuid is a user uuid:
+      if ArvadosBase::resource_class_for_uuid(params[:project_uuid]) == User
+        search_what = User.find params[:project_uuid]
+      else
+        search_what = Group.find params[:project_uuid]
+      end
     end
     @objects = search_what.contents(limit: @limit,
                                     offset: @offset,

diff --git a/apps/workbench/app/views/application/_projects_tree_menu.html.erb b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
index ee96d2797a70c69d5e9cdb07ccf118b7f40620b1..600c6ab96fcfca4f8a5980746e9a7fca8ffa75e9 100644 (file)
--- a/apps/workbench/app/views/application/_projects_tree_menu.html.erb
+++ b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
@@ -1,12 +1,13 @@
-              <li role="presentation" class="dropdown-header">
-                <%= top_button.andand.call %>
-                My projects
+              <li>
+                <%= project_link_to.call({object: current_user, depth: 0}) do %>
+                  <span style="padding-left: 0"></span>Home
+                <% end %>
               </li>
               <% my_project_tree.each do |pnode| %>
                 <% next if pnode[:object].class != Group %>
                 <li>
                   <%= project_link_to.call pnode do %>
-                    <span style="padding-left: <%= pnode[:depth]-1 %>em"></span><%= pnode[:object].name %>
+                    <span style="padding-left: <%= pnode[:depth] %>em"></span><%= pnode[:object].name %>
                   <% end %>
                 </li>
               <% end %>