Fix redirects. Add link to new team and new group
This commit is contained in:
parent
6350b32a3d
commit
6743ecec59
3 changed files with 17 additions and 9 deletions
|
@ -47,7 +47,7 @@ class Admin::TeamsController < Admin::ApplicationController
|
||||||
def destroy
|
def destroy
|
||||||
user_team.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
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
|
@ -28,7 +28,7 @@ class TeamsController < ApplicationController
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
user_team.destroy
|
user_team.destroy
|
||||||
redirect_to teams_path
|
redirect_to dashboard_path
|
||||||
end
|
end
|
||||||
|
|
||||||
def new
|
def new
|
||||||
|
|
|
@ -15,12 +15,20 @@
|
||||||
%span Namespace
|
%span Namespace
|
||||||
.input
|
.input
|
||||||
= f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'chosen'}
|
= f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'chosen'}
|
||||||
- elsif current_user.can_create_group?
|
|
||||||
.clearfix
|
|
||||||
.input.light
|
|
||||||
Need a group for several projects?
|
|
||||||
= link_to new_group_path, class: "btn very_small" do
|
|
||||||
Create a group
|
|
||||||
%hr
|
|
||||||
%p.padded
|
%p.padded
|
||||||
New projects are private by default. You choose who can see the project and commit to repository.
|
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 dependent projects?
|
||||||
|
= link_to new_group_path, class: "btn very_small" do
|
||||||
|
Create a group
|
||||||
|
- 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
|
||||||
|
|
Loading…
Reference in a new issue