From 6f0e621f3c54deb743661ba418a6e8222ff4563b Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Wed, 14 May 2014 16:06:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84account?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 10 ++++++++++
 app/helpers/members_helper.rb     |  2 +-
 app/models/user.rb                |  6 +++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index aeacae866..6b8525a00 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -390,6 +390,16 @@ module ApplicationHelper
     s.html_safe
   end
 
+  #扩展的checkbox生成
+  def principals_check_box_tags_ex(name, principals)
+    s = ''
+    principals.each do |principal|
+      s << "<label>#{ check_box_tag name, principal.id, false, :id => nil } #{h principal.userInfo }</label>\n"
+    end
+    s.html_safe
+  end
+
+
   # Returns a string for users/groups option tags
   def principals_options_for_select(collection, selected=nil)
     s = ''
diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index 915e02627..75676f475 100644
--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -24,7 +24,7 @@ module MembersHelper
     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('membership[user_ids][]', principals), :id => 'principals')
+    s = content_tag('div', principals_check_box_tags_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
diff --git a/app/models/user.rb b/app/models/user.rb
index 20624888a..d16d790d2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -190,7 +190,11 @@ class User < Principal
       where(" LOWER(concat(lastname, firstname)) LIKE :p ", :p => pattern)
     end
   }
-  
+
+  #选择项目成员时显示的用户信息文字
+  def userInfo
+   info=self.name + '   (' + self.login + ')';
+  end
   
    ###添加留言   fq
   def add_jour(user, notes, reference_user_id = 0, options = {})

From b733f5c2b90aaa6d8c18d860c4d4e52f0839b008 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Wed, 14 May 2014 17:11:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=94=A8=E6=88=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d4248e3cc..b18497548 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -548,6 +548,14 @@ class UsersController < ApplicationController
         format.api  { render_validation_errors(@user) }
       end
     end
+
+    unless @user.id.nil?
+      #后台注册的用户默认权限为男性开发员
+      ue = UserExtensions.create(:identity => 3,
+                                  :gender => 0,
+                                 :user_id => @user.id)
+      ue.save
+    end
   end
 
   def edit