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

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

diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index 8f6b96e73ce2d698b2f2aa0f349ed4462e46388d..01ab89b910b519cd5df8388cd0ad98edd67cc047 100644 (file)
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -8,7 +8,7 @@ class ProjectsController < ApplicationController
   end
 
   def show_pane_list
-    %w(Contents Permissions Advanced)
+    %w(Data_collections Jobs_and_pipelines Pipeline_templates Subprojects Other_objects Permissions Advanced)
   end
 
   def remove_item
@@ -60,6 +60,11 @@ class ProjectsController < ApplicationController
         object.update_attributes! owner_uuid: current_user.uuid
       end
     end
+    if ArvadosBase::resource_class_for_uuid(@object.owner_uuid) == Group
+      params[:return_to] ||= group_path(@object.owner_uuid)
+    else
+      params[:return_to] ||= projects_path
+    end
     super
   end