deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

User blocking improved. Admin area styled

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-04-16 23:33:03 +03:00
parent c0df0cd70c
commit c9def945d4
13 changed files with 231 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/application_controller.rb
View file

@ -1,5 +1,6 @@
class ApplicationController < ActionController::Base
before_filter :authenticate_user!
before_filter :reject_blocked!
before_filter :set_current_user_for_mailer
protect_from_forgery
helper_method :abilities, :can?
@ -16,6 +17,14 @@ class ApplicationController < ActionController::Base
protected
def reject_blocked!
if current_user && current_user.blocked
sign_out current_user
flash[:alert] = "Your account was blocked"
redirect_to new_user_session_path
end
end
def after_sign_in_path_for resource
if resource.is_a?(User) && resource.respond_to?(:blocked) && resource.blocked
sign_out resource