Move admin team members management to own controller

4 files changed, 87 insertions, 23 deletions

diff --git a/app/views/admin/teams/members/_form.html.haml b/app/views/admin/teams/members/_form.html.haml
new file mode 100644
index 00000000000..b75d788a94a
--- /dev/null
+++ b/app/views/admin/teams/members/_form.html.haml
@@ -0,0 +1,20 @@
+= form_tag admin_team_member_path(@team, @member), method: :put do
+  -if @member.errors.any?
+    .alert-message.block-message.error
+      %ul
+        - @member.errors.full_messages.each do |msg|
+          %li= msg
+
+  .clearfix
+    %label Default access for Team projects:
+    .input
+      = select_tag :default_project_access, options_for_select(UserTeam.access_roles, @team.default_projects_access(@member)), class: "project-access-select chosen span3"
+  .clearfix
+    %label Team admin?
+    .input
+      = check_box_tag :group_admin, true, @team.admin?(@member)
+
+  %br
+  .actions
+    = submit_tag 'Save', class: "btn primary"
+    = link_to 'Cancel', :back, class: "btn"
diff --git a/app/views/admin/teams/members/edit.html.haml b/app/views/admin/teams/members/edit.html.haml
new file mode 100644
index 00000000000..a82847ee5f8
--- /dev/null
+++ b/app/views/admin/teams/members/edit.html.haml
@@ -0,0 +1,16 @@
+%h3
+  Edit access #{@member.name} in #{@team.name} team
+
+%hr
+%table.zebra-striped
+  %tr
+    %td User:
+    %td= @member.name
+  %tr
+    %td Team:
+    %td= @team.name
+  %tr
+    %td Since:
+    %td= member_since(@team, @member).stamp("Nov 11, 2010")
+
+= render 'form'
diff --git a/app/views/admin/teams/members/new.html.haml b/app/views/admin/teams/members/new.html.haml
new file mode 100644
index 00000000000..5cdf07359c8
--- /dev/null
+++ b/app/views/admin/teams/members/new.html.haml
@@ -0,0 +1,29 @@
+%h3.page_title
+  Team: #{@team.name}
+
+%fieldset
+  %legend Members (#{@team.members.count})
+  = form_tag add_members_admin_team_path(@team), id: "team_members", class: "bulk_import", method: :post  do
+    %table#members_list
+      %thead
+        %tr
+          %th User name
+          %th Default project access
+          %th Team access
+          %th
+      - @team.members.each do |member|
+        %tr.member
+          %td
+            = link_to [:admin, member] do
+              = member.name
+              %small= "(#{member.email})"
+          %td= @team.human_default_projects_access(member)
+          %td= @team.admin?(member) ? "Admin" : "Member"
+          %td
+      %tr
+        %td= select_tag :user_ids, options_from_collection_for_select(@users , :id, :name_with_email), multiple: true, data: {placeholder: 'Select users'}, class: 'chosen span5'
+        %td= select_tag :default_project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3" }
+        %td
+          %span= check_box_tag :group_admin
+          %span Admin?
+        %td= submit_tag 'Add', class: "btn primary", id: :add_members_to_team
diff --git a/app/views/admin/teams/show.html.haml b/app/views/admin/teams/show.html.haml
index 0f47717ae0e..05a3a1d3e16 100644
--- a/app/views/admin/teams/show.html.haml
+++ b/app/views/admin/teams/show.html.haml
@@ -41,31 +41,30 @@
 
 %fieldset
   %legend Members (#{@team.members.count})
-  = form_tag add_members_admin_team_path(@team), id: "team_members", class: "bulk_import", method: :post  do
-    %table#members_list
-      %thead
-        %tr
-          %th User name
-          %th Default project access
-          %th Team access
-          %th.cred Danger Zone!
-      - @team.members.each do |member|
-        %tr.member
-          %td
-            = link_to [:admin, member] do
-              = member.name
-              %small= "(#{member.email})"
-          %td= @team.human_default_projects_access(member)
-          %td= @team.admin?(member) ? "Admin" : "Member"
-          %td.bgred
-            = link_to 'Remove', remove_member_admin_team_path(@team, member_id: member.id), confirm: 'Remove project from team and move to global namespace. Are you sure?', method: :delete, class: "btn danger small"
+  %table#members_list
+    %thead
       %tr
-        %td= select_tag :user_ids, options_from_collection_for_select(@users , :id, :name_with_email), multiple: true, data: {placeholder: 'Select users'}, class: 'chosen span5'
-        %td= select_tag :default_project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3" }
+        %th User name
+        %th Default project access
+        %th Team access
+        %th.cred Danger Zone!
+    - @team.members.each do |member|
+      %tr.member
         %td
-          %span= check_box_tag :group_admin
-          %span Admin?
-        %td= submit_tag 'Add', class: "btn primary", id: :add_members_to_team
+          = link_to [:admin, member] do
+            = member.name
+            %small= "(#{member.email})"
+        %td= @team.human_default_projects_access(member)
+        %td= @team.admin?(member) ? "Admin" : "Member"
+        %td.bgred
+          = link_to 'Edit', edit_admin_team_member_path(@team, member), class: "btn small"
+           
+          = link_to 'Remove', admin_team_member_path(@team, member), confirm: 'Remove member from team. Are you sure?', method: :delete, class: "btn danger small"
+    %tr
+      %td
+      %td
+      %td
+      %td= link_to 'Add members', new_admin_team_member_path(@team), class: "btn primary", id: :add_members_to_team
 
 %fieldset
   %legend Projects (#{@team.projects.count})