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

factorize before_filters and layout for projects related controllers

Browse source
This commit is contained in:
Cyril 2012-09-26 01:21:37 +02:00
parent 0439387be0
commit 078a8f0e66
17 changed files with 33 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/controllers/projects_controller.rb
View file

@ -1,11 +1,9 @@
require Rails.root.join('lib', 'gitlab', 'graph_commit')
class ProjectsController < ApplicationController
before_filter :project, except: [:index, :new, :create]
layout :determine_layout
class ProjectsController < ProjectController
skip_before_filter :project, only: [:new, :create]
# Authorize
before_filter :add_project_abilities
before_filter :authorize_read_project!, except: [:index, :new, :create]
before_filter :authorize_admin_project!, only: [:edit, :update, :destroy]
before_filter :require_non_empty_project, only: [:blob, :tree, :graph]
@ -93,19 +91,4 @@ class ProjectsController < ApplicationController
format.html { redirect_to root_path }
end
end
protected
def project
@project ||= Project.find_by_code(params[:id])
@project || render_404
end
def determine_layout
if @project && !@project.new_record?
"project"
else
"application"
end
end
end