From 2a928455f9dcefa465b80b79768ba1d1a423e6e9 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 3 Dec 2012 10:52:01 +0100 Subject: enable users to cancel their account --- users/app/controllers/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/app/controllers') diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index 3407191..cffc8c6 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -36,7 +36,7 @@ class UsersController < ApplicationController def destroy @user.destroy - redirect_to users_path + redirect_to admin? ? users_path : login_path end protected -- cgit v1.2.3 From a2d343619e752f62cb7e3445803e4491696af391 Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 7 Dec 2012 12:30:15 +0100 Subject: using normal requests for user updates except password password requires ajax for secure remote password to work --- users/app/controllers/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/app/controllers') diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index cffc8c6..320ed96 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -31,7 +31,7 @@ class UsersController < ApplicationController def update @user.update_attributes(params[:user]) - respond_with @user + respond_with @user, :location => edit_user_path(@user) end def destroy -- cgit v1.2.3 From 85be030a434cfab4b7728e4883624d362ec7afbd Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 7 Dec 2012 13:00:44 +0100 Subject: first stub at displaying success messages --- users/app/controllers/users_controller.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'users/app/controllers') diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index 320ed96..24db13b 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -22,7 +22,9 @@ class UsersController < ApplicationController end def create - @user = User.create(params[:user]) + if @user = User.create(params[:user]) + flash[:notice] = t(:user_created_successfully) + end respond_with @user end @@ -30,7 +32,9 @@ class UsersController < ApplicationController end def update - @user.update_attributes(params[:user]) + if @user.update_attributes(params[:user]) + flash[:notice] = t(:user_updated_successfully) + end respond_with @user, :location => edit_user_path(@user) end -- cgit v1.2.3 From 7273dab05b68f033de26bb68cca4b72c17b9908a Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 7 Dec 2012 14:24:10 +0100 Subject: fixed signup and removed flash that was not getting displayed I also tried flash.keep(:notice) but that did not help - not sure how to keep the flash until the root url has rendered. --- users/app/controllers/users_controller.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'users/app/controllers') diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index 24db13b..4921a4a 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -22,9 +22,7 @@ class UsersController < ApplicationController end def create - if @user = User.create(params[:user]) - flash[:notice] = t(:user_created_successfully) - end + @user = User.create(params[:user]) respond_with @user end -- cgit v1.2.3