gitlab用户管理更新

app/helpers/application_helper.rb

@@ -479,6 +479,15 @@ module ApplicationHelper
     s.html_safe
   end
 
+  #扩展的checkbox生成
+  def principals_check_box_tags_style_ex(name, principals)
+    s = ''
+    principals.each do |principal|
+      s << "<label style=' display:block'>#{ check_box_tag name, principal.id, false, :id => nil } #{h principal.userInfo }</label>\n"
+    end
+    s.html_safe
+  end
+
   #扩展的checkbox生成
   def principals_radio_box_tags_ex(name, principals)
     s = ''

app/helpers/repositories_helper.rb

@@ -46,6 +46,23 @@ module RepositoriesHelper
     end
   end
 
+  # 项目成员列表
+  def render_principals_for_project(project)
+    scope = Principal.active.sorted.member_of(project).like(params[:q])
+    principal_count = scope.count
+    principal_pages = Redmine::Pagination::Paginator.new principal_count, 10, params['page'] #by young
+    principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all
+
+    s = content_tag('div', principals_check_box_tags_style_ex('membership[user_ids][]', principals), :id => 'principals')
+
+    links = pagination_links_full(principal_pages, principal_count, :per_page_links => false) {|text, parameters, options|
+      link_to text, autocomplete_project_memberships_path(project, parameters.merge(:q => params[:q], :format => 'js')), :remote => true
+    }
+
+    s + content_tag('div', content_tag('ul', links), :class => 'pagination_new')
+  end
+
+
   def render_changeset_changes
     changes = @changeset.filechanges.limit(1000).reorder('path').all.collect do |change|
       case change.action

app/views/repositories/_gitlab_user_manage.html.erb

@@ -1,126 +1,103 @@
 <%= error_messages_for 'member' %>
 <%
+   roles = Hash.new
+   roles[:GUEST] = GitlabHelper::GUEST
+   roles[:REPORTER] = GitlabHelper::REPORTER
+   roles[:DEVELOPER] = GitlabHelper::DEVELOPER
+   roles[:MASTER] = GitlabHelper::MASTER
    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">
+  <table>
+    <tr>
+      <td style="width: 50%">
+        <div class="splitcontentleft1">
+          <% 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| %>
+                        <%= 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>
+                            <p>
+                              <% roles.each do |role| %>
+                                  <label><%= radio_button_tag 'gitlab[role_ids][]', role[1] %> <%= h role[0] %></label><br/>
+                              <% end %></p>
 
-  <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| %>
+                            <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 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 %>
+                      <%= 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>
+      </td>
+      <td style="width: 50%">
+        <div class="splitcontentright1">
+          <% if roles.any? %>
+              <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
                   <fieldset>
-                    <legend><%= l(:label_apply_project) %></legend>
+                    <legend><%= l(:label_member_new) %></legend>
 
-                    <div id="principals_for_applied_member">
-                      <%= render_principals_for_applied_members(@project) %>
+                    <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_project(@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>
+                          <label style=" display:block;height: 5px"><%= radio_button_tag 'gitlab[role_ids][]', role[1] %> <%= h role[0] %></label><br/>
                       <% 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>
+                    <p><%= submit_tag l(:button_add), :id => 'member-add-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') }')" %>
+          <% end %>
+        </div>
+      </td>
+    </tr>
+  </table>
 
-              <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>

app/views/repositories/committers.html.erb

@@ -3,27 +3,22 @@
 <%= simple_format(l(:text_repository_usernames_mapping)) %>
 
 <!--新增gitlab用户界面 by nwb-->
+<% if User.current.logged? && User.current.allowed_to?(:add_gitlab_user, @project)%>
 <div class="borad-setitle">
-	<%= link_to l(:label_message_new),
+	<%= link_to l(:label_gitlab_user_manage),
                 "javascript:void(0);",
-                :class => 'icon icon-add',
-                :onclick => 'showAndScrollTo("gitlab-user-manager", "message_subject"); return false;' if User.current.logged? %>
+                :class => 'icon icon-edit',
+                :onclick => "$('#gitlab-user-manager').show(); 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| %>
+      <%= form_for @project, :url => project_path(@project), :html => {:multipart => true, :id => 'message-form'} do |f| %>
           <%= render :partial => 'gitlab_user_manage', :locals => {:f => f} %>
           <p><%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
             <%= link_to l(:button_cancel), "#", :onclick => '$("#gitlab-user-manager").hide(); return false;' ,:class => 'whiteButton m3p10'  %></p>
       <% end %>
       <div id="preview" class="wiki"></div>
-  <% end %>
 </div>
-
+<% end %>
 
 <% if @committers.empty? %>
 <p class="nodata"><%= l(:label_no_data) %></p>

config/locales/en.yml

@@ -1371,6 +1371,7 @@ en:
   label_gitlab_email: The email user to login gitlab
   label_gitlab_account: The account user to login gitlab
   label_gitlab_password: The password user to login gitlab
+  label_gitlab_user_manage: Gitlab user manage
   label_are_you_sure: Are you sure？
   label_how_commit_code: How to commit code：
   label_how_commit_code_chinese: Chinese

config/locales/zh.yml

@@ -1572,6 +1572,7 @@ zh:
   label_gitlab_account: 用户登录Gitlab的账号，推荐使用当前用户。注意：若当前用户已创建过版本库，则会使用老账号
   label_gitlab_email: 用户登录Gitlab的邮件，推荐使用当前用户邮件
   label_gitlab_password: 用户登录Gitlab的密码，推荐使用当前用户密码。注意：若当前用户已创建过版本库，则会使用老密码
+  label_gitlab_user_manage: Gitlab用户管理
   label_are_you_sure: 您确定要删除版本库吗？如果这是系统创建的Git库，将同时删除所有版本数据。
   label_how_commit_code: 查看如何提交代码：
   label_how_commit_code_chinese: 中文

lib/redmine.rb

@@ -172,6 +172,8 @@ Redmine::AccessControl.map do |map|
     map.permission :view_issue_watchers, {}, :read => true
     map.permission :add_issue_watchers, {:watchers => [:new, :create, :append, :autocomplete_for_user]}
     map.permission :delete_issue_watchers, {:watchers => :destroy}
+
+    map.permission :add_gitlab_user, {:repositories => :committers}, :require => :loggedin
   end
 
   map.project_module :time_tracking do |map|