Download as
Browse Code »

Commit 439229efa393391d1998248cdcf06d0a03c106eb

Authored by Dmitriy Zaporozhets
2 parents 5ee8c132 890e774d
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #2777 from zzet/add_project_button 

Add assign project to team button on team page
Showing 3 changed files with 5 additions and 5 deletions   Show diff stats
app/views/projects/_new_form.html.haml
  Diff comments   View file @439229e
... ... @@ -29,6 +29,6 @@
29 29 - if current_user.can_create_team?
30 30 .clearfix
31 31 .input.light
32   - Want to share a team between projects?
  32 + Want to share a project between team?
33 33 = link_to new_team_path, class: "btn very_small" do
34 34 Create a team
... ...
app/views/teams/_projects.html.haml
  Diff comments   View file @439229e
... ... @@ -3,11 +3,11 @@
3 3 Projects
4 4 %small
5 5 (#{projects.count})
6   - - if can? current_user, :manage_group, @group
  6 + - if can? current_user, :manage_user_team, @team
7 7 %span.right
8   - = link_to new_project_path(namespace_id: @group.id), class: "btn very_small info" do
  8 + = link_to new_team_project_path(@team), class: "btn very_small info" do
9 9 %i.icon-plus
10   - New Project
  10 + Assign Project
11 11 %ul.well-list
12 12 - if projects.blank?
13 13 %p.nothing_here_message This team has no projects yet
... ...
app/views/teams/members/_show.html.haml
  Diff comments   View file @439229e
... ... @@ -18,7 +18,7 @@
18 18 .left.span2
19 19 %span
20 20 Admin access
21   - = check_box_tag :group_admin
  21 + = check_box_tag :group_admin, true, @team.admin?(user)
22 22 .right
23 23 - if current_user == user
24 24 %span.btn.disabled This is you!
... ...