From ccaede2f1d39a7f8f99aa12f62f464aca6065e81 Mon Sep 17 00:00:00 2001 From: manson Date: Wed, 16 Jul 2014 19:39:23 +0800 Subject: [PATCH] added validation feedback for memebr form --- app/controllers/admin/members_controller.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb index d46798c..d470da9 100644 --- a/app/controllers/admin/members_controller.rb +++ b/app/controllers/admin/members_controller.rb @@ -136,14 +136,15 @@ class Admin::MembersController < OrbitMemberController def update respond_to do |format| - if @member.update_attributes(member_profile_params) - if @member.user.present? - @member.user.update(user_params) - else - @user = User.new(user_params) - @user.save - @user.update_attributes(member_profile_id: @member.id) - end + if @member.user.present? + @user = @member.user + @user.update(user_params) + else + @user = User.new(user_params) + @user.member_profile = @member + end + + if @member.update_attributes(member_profile_params) and @user.save if params[:edit_type]!="edit_privilege" and params[:member_profile][:role_status_ids].nil? @member.update_attributes(role_status_ids: []) end