From 45917935ef38cdb35b152dc8a04b37efb92f33f0 Mon Sep 17 00:00:00 2001
From: Andrey Kumanyaev <me@zzet.org>
Date: Sat, 26 Jan 2013 00:37:55 +0400
Subject: fix copied code. Add assign projects button.

---
 app/views/teams/_projects.html.haml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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
-- 
cgit v1.2.1


From b280c2f361ab2c22166523a3123c378d69fdf4df Mon Sep 17 00:00:00 2001
From: Andrey Kumanyaev <me@zzet.org>
Date: Sat, 26 Jan 2013 00:38:21 +0400
Subject: Edit create new team text

---
 app/views/projects/_new_form.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v1.2.1


From 890e774ddc7bea953daddcce9f5677fafc30896a Mon Sep 17 00:00:00 2001
From: Andrey Kumanyaev <me@zzet.org>
Date: Sat, 26 Jan 2013 01:14:36 +0400
Subject: Display actual user role (admin or not) in team members list

---
 app/views/teams/members/_show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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!
-- 
cgit v1.2.1