From 38fcc263bdb71993cf0fc4af47483174ede56fb3 Mon Sep 17 00:00:00 2001 From: Ken Johnson Date: Fri, 31 May 2013 22:10:32 -0400 Subject: [PATCH] update account is now an ajax call --- app/controllers/users_controller.rb | 8 +++- app/views/users/account_settings.html.erb | 47 +++++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3be0484..f00c6a7 100755 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -23,12 +23,16 @@ class UsersController < ApplicationController end def update + message = false current_user.skip_user_id_assign = true current_user.update_attributes(params[:user].reject { |k| k == ("password" || "password_confirmation") }) pass = params[:user][:password] current_user.password = pass if !(pass.blank?) - flash[:success] = "Account Updated!" if current_user.save! - redirect_to user_account_settings_path(:user_id => current_user.user_id) + message = true if current_user.save! + respond_to do |format| + format.html { redirect_to user_account_settings_path(:user_id => current_user.user_id) } + format.json { render :json => {:msg => message ? "success" : "false "} } + end end end diff --git a/app/views/users/account_settings.html.erb b/app/views/users/account_settings.html.erb index c1e9e81..06d6df5 100755 --- a/app/views/users/account_settings.html.erb +++ b/app/views/users/account_settings.html.erb @@ -1,5 +1,29 @@
+
+
+ +
+
+
+
+ +
+
@@ -53,6 +77,29 @@ <%= javascript_include_tag ('validation.js')%> +