From 0cff91594c743ce0cece51b61243d160098577af Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 22 Oct 2014 14:51:14 +0800 Subject: [PATCH] member update modified and h2 tag in orbit bar --- app/controllers/admin/members_controller.rb | 9 ++++++--- app/views/orbit_bar/index.html.erb | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb index eb775e0..b3963ee 100644 --- a/app/controllers/admin/members_controller.rb +++ b/app/controllers/admin/members_controller.rb @@ -496,11 +496,14 @@ class Admin::MembersController < OrbitMemberController @user = @member.user @user.update(user_params) else - @user = User.new(user_params) - @user.member_profile = @member + if user_params["user_name"] != "" + @user = User.new(user_params) rescue nil + @user.member_profile = @member + @user.save + end end - if @member.update_attributes(member_profile_params) and @user.save + if @member.update_attributes(member_profile_params) if params[:edit_type]!="edit_privilege" and (params[:member_profile].nil? or params[:member_profile][:role_status_ids].nil?) @member.update_attributes(role_status_ids: []) end diff --git a/app/views/orbit_bar/index.html.erb b/app/views/orbit_bar/index.html.erb index 99e0a85..9b78ec7 100644 --- a/app/views/orbit_bar/index.html.erb +++ b/app/views/orbit_bar/index.html.erb @@ -36,9 +36,9 @@ -

+

Orbit -

+