Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/controllers/members_controller.rb

@@ -229,7 +229,7 @@ class MembersController < ApplicationController
             user_ids.each do |user_id|
               member =  Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id)
 
-              role_ids = attrs.delete(:role_ids)
+              role_ids = params[:membership][:role_ids]
               #role = Role.find(params[:membership][:role_ids])
               # 这里的判断只能通过角色名，可以弄成常量
               if role_ids && role_ids.include?("10")

app/models/member.rb

@@ -52,6 +52,9 @@ class Member < ActiveRecord::Base
     ids += member_roles.select {|mr| !mr.inherited_from.nil?}.collect(&:role_id)
 
     new_role_ids = ids - role_ids
+    if (new_role_ids.include?(7) || new_role_ids.include?(9)) && role_ids.include?(10)
+      member_roles.where("role_id = 10").first.update_column('is_current', 0)
+    end
     # Add new roles
     if new_role_ids.include?(7) && new_role_ids.include?(10)
       member_roles << MemberRole.new(:role_id => 7)