Merge pull request #2777 from zzet/add_project_button

Add assign project to team button on team page

Merge pull request #2777 from zzet/add_project_button
Add assign project to team button on team page
Dmitriy Zaporozhets
2 parents 5ee8c132 890e774d
Showing 3 changed files with 5 additions and 5 deletions Show diff stats
app/views/projects/_new_form.html.haml
app/views/teams/_projects.html.haml
app/views/teams/members/_show.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
@@ -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
@@ -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!
	@@ -29,6 +29,6 @@		@@ -29,6 +29,6 @@
29	- if current_user.can_create_team?	29	- if current_user.can_create_team?
30	.clearfix	30	.clearfix
31	.input.light	31	.input.light
32	- Want to share a team between projects?	32	+ Want to share a project between team?
33	= link_to new_team_path, class: "btn very_small" do	33	= link_to new_team_path, class: "btn very_small" do
34	Create a team	34	Create a team
	@@ -3,11 +3,11 @@		@@ -3,11 +3,11 @@
3	Projects	3	Projects
4	%small	4	%small
5	(#{projects.count})	5	(#{projects.count})
6	- - if can? current_user, :manage_group, @group	6	+ - if can? current_user, :manage_user_team, @team
7	%span.right	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	%i.icon-plus	9	%i.icon-plus
10	- New Project	10	+ Assign Project
11	%ul.well-list	11	%ul.well-list
12	- if projects.blank?	12	- if projects.blank?
13	%p.nothing_here_message This team has no projects yet	13	%p.nothing_here_message This team has no projects yet
	@@ -18,7 +18,7 @@		@@ -18,7 +18,7 @@
18	.left.span2	18	.left.span2
19	%span	19	%span
20	Admin access	20	Admin access
21	- = check_box_tag :group_admin	21	+ = check_box_tag :group_admin, true, @team.admin?(user)
22	.right	22	.right
23	- if current_user == user	23	- if current_user == user
24	%span.btn.disabled This is you!	24	%span.btn.disabled This is you!