Merge branch 'master' into 6234-user-edit-self

[arvados.git] / apps / workbench / app / controllers / actions_controller.rb

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index e6ef6eb894d9ca3e6aad25aba909bcbbb0f32305..cbe7e37fe5ca4c7f38b1b642db9f62294414aacb 100644 (file)
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -91,7 +91,8 @@ class ActionsController < ApplicationController
     end
     if (resource_classes == [Collection] and
         @object.is_a? Group and
-        @object.group_class == 'project')
+        @object.group_class == 'project') or
+        @object.is_a? User
       # In the common case where only collections are copied/moved
       # into a project, it's polite to land on the collections tab on
       # the destination project.