user can't delete self and flash_messages

This commit is contained in:
chris authored and ihower committed 2011-04-13 18:22:50 +08:00
1 parent 318c264cae
commit e62df90117
9 files changed
+67 -16

No files matched your search

+8 -2
View File
@@ -22,6 +22,7 @@ class Panel::UsersController < ApplicationController
def create
@user = User.new(params[:user])
if @user.save
flash[:notice] = t('panel.create_success_user')
redirect_to :action => :index
else
render :action => :new
@@ -43,6 +44,7 @@ class Panel::UsersController < ApplicationController
@user.avatar = params[:file] if params[:file]
if @user.update_attributes(params[:user])
flash[:notice] = t('panel.update_success_user')
redirect_to :action => :index
else
@user_info_models = UserInfoModel.all.entries
@@ -52,8 +54,12 @@ class Panel::UsersController < ApplicationController
end
def destroy
@user = User.find(params[:id])
@user.destroy
if params[:id].eql?(session['warden.user.user.key'][1].to_s)
flash[:error] = t('panel.cant_delete_self')
else
@user = User.find(params[:id])
@user.destroy
end
redirect_to :action => :index
end