Merge branch 'master' into 3140-project-content-tabs

[arvados.git] / apps / workbench / app / views / projects / _show_contents.html.erb

diff --git a/apps/workbench/app/views/projects/_show_contents.html.erb b/apps/workbench/app/views/projects/_show_contents.html.erb
index bfd63ddb05a85f303e0eb70923d1e7cce41e38c2..0c8fab208e2f657a0c612fb3a844673633cb3df3 100644 (file)
--- a/apps/workbench/app/views/projects/_show_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_contents.html.erb
@@ -41,6 +41,7 @@
        choose_projects_path(
         title: 'Move this project to...',
         editable: true,
+        my_root_selectable: true,
         action_name: 'Move',
         action_href: project_path(@object.uuid),
         action_method: 'put',
@@ -48,7 +49,7 @@
        { class: "btn btn-sm btn-primary arv-move-to-project", remote: true, method: 'get' }) do %>
       <i class="fa fa-fw fa-truck"></i> Move project...
     <% end %>
-    <%= link_to(project_path(id: @object.uuid, return_to: projects_path), method: 'delete', class: 'btn btn-sm btn-primary', data: {confirm: "Really delete project '#{@object.name}'?"}) do %>
+    <%= link_to(project_path(id: @object.uuid), method: 'delete', class: 'btn btn-sm btn-primary', data: {confirm: "Really delete project '#{@object.name}'?"}) do %>
       <i class="fa fa-fw fa-trash-o"></i> Delete project
     <% end %>
   <% end %>