From bc865ccb4f30baaccbe5caae4a3d9c29778a5ec6 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Fri, 25 Jul 2014 15:03:02 +0800
Subject: [PATCH] =?UTF-8?q?gitlab=E6=88=90=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/_gitlab_user_manage.html.erb | 126 ++++++++++++++++++
 app/views/repositories/committers.html.erb    |  13 +-
 2 files changed, 135 insertions(+), 4 deletions(-)
 create mode 100644 app/views/repositories/_gitlab_user_manage.html.erb

diff --git a/app/views/repositories/_gitlab_user_manage.html.erb b/app/views/repositories/_gitlab_user_manage.html.erb
new file mode 100644
index 000000000..30cf76f8a
--- /dev/null
+++ b/app/views/repositories/_gitlab_user_manage.html.erb
@@ -0,0 +1,126 @@
+<%= error_messages_for 'member' %>
+<%
+   members = @project.members
+%>
+
+<!--项目的gitlab成员列表-->
+<div id="project_gitlab_user_div">
+  <div class="splitcontentleft">
+    <% if members.any? %>
+        <table class="list members">
+          <thead>
+          <tr>
+            <th><%= l(:label_user) %></th>
+            <th><%= l(:label_role_plural) %></th>
+            <th style="width:15%"></th>
+            <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
+          </tr>
+          </thead>
+          <tbody>
+          <% members.each do |member| %>
+              <% next if member.new_record? %>
+              <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
+                <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
+                <td class="roles">
+    <span id="member-<%= member.id %>-roles">
+      <%= h member.roles.sort.collect(&:to_s).join(', ') %>
+    </span>
+                  <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
+                                        :method => :put,
+                                        :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
+                      ) do |f| %>
+
+                      <p>
+                        <% roles.each do |role| %>
+                            <label><%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
+                                                     :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %> <%= h role %></label><br/>
+                        <% end %></p>
+                      <%= hidden_field_tag 'membership[role_ids][]', '' %>
+                      <p><%= submit_tag l(:button_change), :class => "small" %>
+                        <%= link_to_function l(:button_cancel),
+                                             "$('#member-#{member.id}-roles').show(); $('#member-#{member.id}-roles-form').hide(); return false;"
+                        %></p>
+                  <% end %>
+                </td>
+                <% if @project.project_type == 1 %>
+                    <% if member.roles.first.to_s == "Manager" %>
+                        <td class="buttons"></td>
+                    <% else %>
+                        <td class="buttons">
+                          <%= link_to_function l(:button_edit),
+                                               "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
+                                               :class => 'icon icon-edit' %>
+                          <%= delete_link membership_path(member),
+                                          :remote => true,
+                                          :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %>
+                        </td>
+                    <% end %>
+                <% else %>
+                    <td class="buttons">
+                      <%= link_to_function l(:button_edit),
+                                           "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
+                                           :class => 'icon icon-edit' %>
+                      <%= delete_link membership_path(member),
+                                      :remote => true,
+                                      :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %>
+                    </td>
+                <% end %>
+                <%= call_hook(:view_projects_settings_members_table_row, {:project => @project, :member => member}) %>
+              </tr>
+          <% end; reset_cycle %>
+          </tbody>
+        </table>
+    <% else %>
+        <p class="nodata"><%= l(:label_no_data) %></p>
+    <% end %>
+  </div>
+
+  <div class="splitcontentright">
+    <% if roles.any? %>
+        <% if @project.applied_projects.any? %>
+            <div id="applied_project_block">
+              <%= form_for(@applied_members, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
+                  <fieldset>
+                    <legend><%= l(:label_apply_project) %></legend>
+
+                    <div id="principals_for_applied_member">
+                      <%= render_principals_for_applied_members(@project) %>
+                    </div>
+                    <!--show the roles which will select-->
+                    <p style="padding-top: 5px"><%= l(:label_role_plural) %>:
+                      <% roles.each do |role| %>
+
+                          <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%= h role %></label>
+                      <% end %></p>
+
+                    <p><%= submit_tag l(:label_approve), :id => 'member-add-submit' %>
+                      <%= submit_tag l(:label_refusal), :name => "refusal_button", :id => 'member-refusal-submit' %>
+                    </p>
+                  </fieldset>
+              <% end %>
+            </div>
+        <% end %>
+
+        <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
+            <fieldset>
+              <legend><%= l(:label_member_new) %></legend>
+
+              <p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
+              <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
+
+              <div id="principals_for_new_member">
+                <%= render_principals_for_new_members(@project) %>
+              </div>
+              <!--show the roles which will select-->
+              <p style="padding-top: 5px"><%= l(:label_role_plural) %>:
+                <% roles.each do |role| %>
+
+                    <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%= h role %></label>
+                <% end %></p>
+
+              <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
+            </fieldset>
+        <% end %>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/repositories/committers.html.erb b/app/views/repositories/committers.html.erb
index 4018b4904..36d82ba43 100644
--- a/app/views/repositories/committers.html.erb
+++ b/app/views/repositories/committers.html.erb
@@ -3,17 +3,22 @@
 <%= simple_format(l(:text_repository_usernames_mapping)) %>
 
 <!--新增gitlab用户界面 by nwb-->
-<div id="add-message" class="add_frame" style="display:none;">
+<div class="borad-setitle">
+	<%= link_to l(:label_message_new),
+                "javascript:void(0);",
+                :class => 'icon icon-add',
+                :onclick => 'showAndScrollTo("gitlab-user-manager", "message_subject"); return false;' if User.current.logged? %>
+</div>
+<div id="gitlab-user-manager" class="add_frame" style="display:none;">
   <% if User.current.logged? && User.current.allowed_to?(:add_gitlab_user, @project)%>
       <h3><%= link_to h(@board.name), course_board_path(@course, @board) %> &#187; <%= l(:label_message_new) %></h3>
       <div class="add_frame_header" >
         <%= l(:label_message_new) %>
       </div>
       <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
-          <%= render :partial => 'messages/form', :locals => {:f => f} %>
+          <%= render :partial => 'gitlab_user_manage', :locals => {:f => f} %>
           <p><%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
-            <%= preview_link(preview_board_message_path(@board), 'message-form' ,target='preview',{:class => 'whiteButton m3p10'} )%> |
-            <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;' ,:class => 'whiteButton m3p10'  %></p>
+            <%= link_to l(:button_cancel), "#", :onclick => '$("#gitlab-user-manager").hide(); return false;' ,:class => 'whiteButton m3p10'  %></p>
       <% end %>
       <div id="preview" class="wiki"></div>
   <% end %>