Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity

This commit is contained in:
Harry Bomrah 2015-05-12 14:10:48 +08:00
commit ba44a224d3
1 changed files with 4 additions and 1 deletions

View File

@ -472,7 +472,10 @@ class Admin::MembersController < OrbitMemberController
if user_params["user_name"] != ""
@user = User.new(user_params) rescue nil
@user.member_profile = @member
@user.save
if !@user.save
@member.destroy
render 'new' and return
end
end
if !params[:member_profile_field_values].nil?
params[:member_profile_field_values].each_with_index do |m,i|