diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-25 13:42:52 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-25 13:42:52 -0800 |
| commit | 439229efa393391d1998248cdcf06d0a03c106eb (patch) | |
| tree | c7fb08fa0dcef3e7e690173aa3f43c9b2d574a53 | |
| parent | 5ee8c132a540973c6726bfb99b2050dccc390449 (diff) | |
| parent | 890e774ddc7bea953daddcce9f5677fafc30896a (diff) | |
| download | gitlab-ce-439229efa393391d1998248cdcf06d0a03c106eb.tar.gz | |
Merge pull request #2777 from zzet/add_project_button
Add assign project to team button on team page
| -rw-r--r-- | app/views/projects/_new_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/teams/_projects.html.haml | 6 | ||||
| -rw-r--r-- | app/views/teams/members/_show.html.haml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/_new_form.html.haml b/app/views/projects/_new_form.html.haml index 41a602147ca..5f7348d47a1 100644 --- a/app/views/projects/_new_form.html.haml +++ b/app/views/projects/_new_form.html.haml @@ -29,6 +29,6 @@ - if current_user.can_create_team? .clearfix .input.light - Want to share a team between projects? + Want to share a project between team? = link_to new_team_path, class: "btn very_small" do Create a team diff --git a/app/views/teams/_projects.html.haml b/app/views/teams/_projects.html.haml index 95202bc6ee5..4d99d5c259b 100644 --- a/app/views/teams/_projects.html.haml +++ b/app/views/teams/_projects.html.haml @@ -3,11 +3,11 @@ Projects %small (#{projects.count}) - - if can? current_user, :manage_group, @group + - if can? current_user, :manage_user_team, @team %span.right - = link_to new_project_path(namespace_id: @group.id), class: "btn very_small info" do + = link_to new_team_project_path(@team), class: "btn very_small info" do %i.icon-plus - New Project + Assign Project %ul.well-list - if projects.blank? %p.nothing_here_message This team has no projects yet diff --git a/app/views/teams/members/_show.html.haml b/app/views/teams/members/_show.html.haml index dbbb382d97f..740d5a498c0 100644 --- a/app/views/teams/members/_show.html.haml +++ b/app/views/teams/members/_show.html.haml @@ -18,7 +18,7 @@ .left.span2 %span Admin access - = check_box_tag :group_admin + = check_box_tag :group_admin, true, @team.admin?(user) .right - if current_user == user %span.btn.disabled This is you! |