Commit 078a8f0e authored by Cyril Jouve's avatar Cyril Jouve
Browse files

factorize before_filters and layout for projects related controllers

parent 6a99b09f8a68
......@@ -76,7 +76,7 @@ def can?(object, action, subject)
end
def project
@project ||= current_user.projects.find_by_code(params[:project_id])
@project ||= current_user.projects.find_by_code(params[:project_id] || params[:id])
@project || render_404
end
......
require "base64"
class CommitsController < ApplicationController
before_filter :project
layout "project"
class CommitsController < ProjectController
# Authorize
before_filter :add_project_abilities
before_filter :authorize_read_project!
before_filter :authorize_code_access!
before_filter :require_non_empty_project
......
class DeployKeysController < ApplicationController
class DeployKeysController < ProjectController
respond_to :html
layout "project"
before_filter :project
# Authorize
before_filter :add_project_abilities
before_filter :authorize_admin_project!
def project
@project ||= Project.find_by_code(params[:project_id])
end
def index
@keys = @project.deploy_keys.all
end
......
class HooksController < ApplicationController
before_filter :project
layout "project"
class HooksController < ProjectController
# Authorize
before_filter :add_project_abilities
before_filter :authorize_read_project!
before_filter :authorize_admin_project!, only: [:new, :create, :destroy]
......
class IssuesController < ApplicationController
before_filter :project
class IssuesController < ProjectController
before_filter :module_enabled
before_filter :issue, only: [:edit, :update, :destroy, :show]
helper_method :issues_filter
layout "project"
# Authorize
before_filter :add_project_abilities
# Allow read any issue
before_filter :authorize_read_issue!
......
class LabelsController < ApplicationController
before_filter :project
class LabelsController < ProjectController
before_filter :module_enabled
layout "project"
# Authorize
before_filter :add_project_abilities
# Allow read any issue
before_filter :authorize_read_issue!
......
class MergeRequestsController < ApplicationController
before_filter :project
class MergeRequestsController < ProjectController
before_filter :module_enabled
before_filter :merge_request, only: [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check, :raw]
before_filter :validates_merge_request, only: [:show, :diffs, :raw]
before_filter :define_show_vars, only: [:show, :diffs]
layout "project"
# Authorize
before_filter :add_project_abilities
# Allow read any merge_request
before_filter :authorize_read_merge_request!
......
class MilestonesController < ApplicationController
before_filter :project
class MilestonesController < ProjectController
before_filter :module_enabled
before_filter :milestone, only: [:edit, :update, :destroy, :show]
layout "project"
# Authorize
before_filter :add_project_abilities
# Allow read any milestone
before_filter :authorize_read_milestone!
......
class NotesController < ApplicationController
before_filter :project
class NotesController < ProjectController
# Authorize
before_filter :add_project_abilities
before_filter :authorize_read_note!
before_filter :authorize_write_note!, only: [:create]
......
class ProjectController < ApplicationController
before_filter :project
# Authorize
before_filter :add_project_abilities
layout :determine_layout
protected
def determine_layout
if @project && !@project.new_record?
'project'
else
'application'
end
end
end
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 @@ def destroy
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
class ProtectedBranchesController < ApplicationController
before_filter :project
class ProtectedBranchesController < ProjectController
# Authorize
before_filter :add_project_abilities
before_filter :authorize_read_project!
before_filter :require_non_empty_project
before_filter :authorize_admin_project!, only: [:destroy, :create]
before_filter :render_full_content
layout "project"
def index
@branches = @project.protected_branches.all
@protected_branch = @project.protected_branches.new
......
require 'github/markup'
class RefsController < ApplicationController
class RefsController < ProjectController
include Gitlab::Encode
before_filter :project
# Authorize
before_filter :add_project_abilities
before_filter :authorize_read_project!
before_filter :authorize_code_access!
before_filter :require_non_empty_project
......@@ -14,8 +12,6 @@ class RefsController < ApplicationController
before_filter :define_tree_vars, only: [:tree, :blob, :blame, :logs_tree]
before_filter :render_full_content
layout "project"
def switch
respond_to do |format|
format.html do
......
class RepositoriesController < ApplicationController
before_filter :project
class RepositoriesController < ProjectController
# Authorize
before_filter :add_project_abilities
before_filter :authorize_read_project!
before_filter :authorize_code_access!
before_filter :require_non_empty_project
before_filter :render_full_content
layout "project"
def show
@activities = @project.commits_with_refs(20)
end
......
class SnippetsController < ApplicationController
before_filter :project
class SnippetsController < ProjectController
before_filter :snippet, only: [:show, :edit, :destroy, :update, :raw]
layout "project"
# Authorize
before_filter :add_project_abilities
# Allow read any snippet
before_filter :authorize_read_snippet!
......
class TeamMembersController < ApplicationController
before_filter :project
layout "project"
class TeamMembersController < ProjectController
# Authorize
before_filter :add_project_abilities
before_filter :authorize_read_project!
before_filter :authorize_admin_project!, except: [:index, :show]
......
class WikisController < ApplicationController
before_filter :project
before_filter :add_project_abilities
class WikisController < ProjectController
before_filter :authorize_read_wiki!
before_filter :authorize_write_wiki!, only: [:edit, :create, :history]
before_filter :authorize_admin_wiki!, only: :destroy
layout "project"
def pages
@wikis = @project.wikis.group(:slug).order("created_at")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment