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

better error handling for not found resource, gitolite error

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-02-22 07:14:54 +02:00
parent 9e6d0710e9
commit 7d279f9302
9 changed files with 73 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/controllers/application_controller.rb
View file

@ -5,7 +5,11 @@ class ApplicationController < ActionController::Base
helper_method :abilities, :can?
rescue_from Gitlabhq::Gitolite::AccessDenied do |exception|
render :file => File.join(Rails.root, "public", "githost_error"), :layout => false
render "errors/gitolite", :layout => "error"
end
rescue_from ActiveRecord::RecordNotFound do |exception|
render "errors/not_found", :layout => "error"
end
layout :layout_by_resource
@ -33,7 +37,8 @@ class ApplicationController < ActionController::Base
end
def project
@project ||= Project.find_by_code(params[:project_id])
@project ||= current_user.projects.find_by_code(params[:project_id])
@project || render_404
end
def add_project_abilities
@ -45,15 +50,23 @@ class ApplicationController < ActionController::Base
end
def authorize_project!(action)
return render_404 unless can?(current_user, action, project)
return access_denied! unless can?(current_user, action, project)
end
def authorize_code_access!
return render_404 unless can?(current_user, :download_code, project)
return access_denied! unless can?(current_user, :download_code, project)
end
def access_denied!
render_404
render "errors/access_denied", :layout => "error"
end
def not_found!
render "errors/not_found", :layout => "error"
end
def git_not_found!
render "errors/git_not_found", :layout => "error"
end
def method_missing(method_sym, *arguments, &block)