diff --git a/app/controllers/admin/teams_controller.rb b/app/controllers/admin/teams_controller.rb index 335add0f57dd0029fe23a6af27f8ae469ec10ba0..786957cbc594496706a3391001676d2bde27a475 100644 --- a/app/controllers/admin/teams_controller.rb +++ b/app/controllers/admin/teams_controller.rb @@ -47,7 +47,7 @@ class Admin::TeamsController < Admin::ApplicationController def destroy user_team.destroy - redirect_to admin_user_teams_path, notice: 'Team of users was successfully deleted.' + redirect_to admin_teams_path, notice: 'Team of users was successfully deleted.' end protected diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb index e69a092c5077ec878fb2349002fcf93c5e57280b..1ac0d5696b683cc39542d2e646a06b99914774e6 100644 --- a/app/controllers/teams_controller.rb +++ b/app/controllers/teams_controller.rb @@ -28,7 +28,7 @@ class TeamsController < ApplicationController def destroy user_team.destroy - redirect_to teams_path + redirect_to dashboard_path end def new diff --git a/app/views/projects/_new_form.html.haml b/app/views/projects/_new_form.html.haml index ba8f255558a8591a8f139f0b3f1102ea20041120..41a602147ca0ff30cbf3e86a2dc8a71c9d2b7734 100644 --- a/app/views/projects/_new_form.html.haml +++ b/app/views/projects/_new_form.html.haml @@ -15,12 +15,20 @@ %span Namespace .input = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'chosen'} - - elsif current_user.can_create_group? + + %p.padded + New projects are private by default. You choose who can see the project and commit to repository. + %hr + + - if current_user.can_create_group? .clearfix .input.light - Need a group for several projects? + Need a group for several dependent projects? = link_to new_group_path, class: "btn very_small" do Create a group - %hr - %p.padded - New projects are private by default. You choose who can see the project and commit to repository. + - if current_user.can_create_team? + .clearfix + .input.light + Want to share a team between projects? + = link_to new_team_path, class: "btn very_small" do + Create a team