Merge pull request #1569 from jouve/simplify_controllers2

Simplify controllers and layout handling

Merge pull request #1569 from jouve/simplify_controllers2
Simplify controllers and layout handling
Dmitriy Zaporozhets
2 parents 3e9836ae be18397d
Showing 29 changed files with 93 additions and 202 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/blame_controller.rb
app/controllers/blob_controller.rb
app/controllers/commit_controller.rb
app/controllers/commits_controller.rb
app/controllers/compare_controller.rb
app/controllers/deploy_keys_controller.rb
app/controllers/errors_controller.rb
app/controllers/hooks_controller.rb
app/controllers/issues_controller.rb
app/controllers/labels_controller.rb
app/controllers/merge_requests_controller.rb
app/controllers/milestones_controller.rb
app/controllers/notes_controller.rb
app/controllers/profile_controller.rb
app/controllers/project_resource_controller.rb
app/controllers/projects_controller.rb
app/controllers/protected_branches_controller.rb
app/controllers/refs_controller.rb
app/controllers/repositories_controller.rb
@@ -10,19 +10,17 @@ class ApplicationController &lt; ActionController::Base
   helper_method :abilities, :can?
   rescue_from Gitlab::Gitolite::AccessDenied do |exception|
-    render "errors/gitolite", layout: "error", status: 500
+    render "errors/gitolite", layout: "errors", status: 500
   end
   rescue_from Encoding::CompatibilityError do |exception|
-    render "errors/encoding", layout: "error", status: 500
+    render "errors/encoding", layout: "errors", status: 500
   end
   rescue_from ActiveRecord::RecordNotFound do |exception|
-    render "errors/not_found", layout: "error", status: 404
+    render "errors/not_found", layout: "errors", status: 404
   end
-  layout :layout_by_resource
-
   protected
   def reject_blocked!
@@ -43,14 +41,6 @@ class ApplicationController &lt; ActionController::Base
     end
   end
-  def layout_by_resource
-    if devise_controller?
-      "devise_layout"
-    else
-      "application"
-    end
-  end
-
   def set_current_user_for_mailer
     MailerObserver.current_user = current_user
   end
@@ -68,7 +58,7 @@ class ApplicationController &lt; ActionController::Base
   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
@@ -85,15 +75,15 @@ class ApplicationController &lt; ActionController::Base
   end
   def access_denied!
-    render "errors/access_denied", layout: "error", status: 404
+    render "errors/access_denied", layout: "errors", status: 404
   end
   def not_found!
-    render "errors/not_found", layout: "error", status: 404
+    render "errors/not_found", layout: "errors", status: 404
   end
   def git_not_found!
-    render "errors/git_not_found", layout: "error", status: 404
+    render "errors/git_not_found", layout: "errors", status: 404
   end
   def method_missing(method_sym, *arguments, &block)
 # Controller for viewing a file's blame
-class BlameController < ApplicationController
+class BlameController < ProjectResourceController
   include ExtractsPath
-  layout "project"
-
-  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
 # Controller for viewing a file's blame
-class BlobController < ApplicationController
+class BlobController < ProjectResourceController
   include ExtractsPath
   include Gitlab::Encode
-  layout "project"
-
-  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
 # Controller for a specific Commit
 #
 # Not to be confused with CommitsController, plural.
-class CommitController < ApplicationController
-  before_filter :project
-  layout "project"
-
+class CommitController < ProjectResourceController
   # Authorize
-  before_filter :add_project_abilities
   before_filter :authorize_read_project!
   before_filter :authorize_code_access!
   before_filter :require_non_empty_project
 require "base64"
-class CommitsController < ApplicationController
-  before_filter :project
-  layout "project"
-
+class CommitsController < ProjectResourceController
   include ExtractsPath
   # Authorize
-  before_filter :add_project_abilities
   before_filter :authorize_read_project!
   before_filter :authorize_code_access!
   before_filter :require_non_empty_project
-class CompareController < ApplicationController
-  before_filter :project
-  layout "project"
-
+class CompareController < ProjectResourceController
   # 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 < ProjectResourceController
   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 ErrorsController < ApplicationController
-  layout "error"
-
   def githost
     render "errors/gitolite"
   end
-class HooksController < ApplicationController
-  before_filter :project
-  layout "project"
-
+class HooksController < ProjectResourceController
   # 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 < ProjectResourceController
   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 < ProjectResourceController
   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 < ProjectResourceController
   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 < ProjectResourceController
   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 < ProjectResourceController
   # Authorize
-  before_filter :add_project_abilities
-
   before_filter :authorize_read_note!
   before_filter :authorize_write_note!, only: [:create]
 class ProfileController < ApplicationController
-  layout "profile"
   before_filter :user
   def show
@@ -0,0 +1,5 @@
+class ProjectResourceController < ApplicationController
+  before_filter :project
+  # Authorize
+  before_filter :add_project_abilities
+end
 require Rails.root.join('lib', 'gitlab', 'graph_commit')
-class ProjectsController < ApplicationController
-  before_filter :project, except: [:index, :new, :create]
-  layout :determine_layout
+class ProjectsController < ProjectResourceController
+  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]
+  layout 'application', only: [:new, :create]
+
   def new
     @project = Project.new
   end
@@ -93,19 +93,4 @@ class ProjectsController &lt; 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
-class ProtectedBranchesController < ApplicationController
-  before_filter :project
-
+class ProtectedBranchesController < ProjectResourceController
   # 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]
-  layout "project"
-
   def index
     @branches = @project.protected_branches.all
     @protected_branch = @project.protected_branches.new
-class RefsController < ApplicationController
+class RefsController < ProjectResourceController
   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
@@ -11,11 +9,9 @@ class RefsController &lt; ApplicationController
   before_filter :ref
   before_filter :define_tree_vars, only: [:blob, :logs_tree]
-  layout "project"
-
-  def switch
-    respond_to do |format|
-      format.html do
+  def switch 
+    respond_to do |format| 
+      format.html do 
         new_path = if params[:destination] == "tree"
                      project_tree_path(@project, @ref)
                    else
-class RepositoriesController < ApplicationController
-  before_filter :project
-
+class RepositoriesController < ProjectResourceController
   # Authorize
-  before_filter :add_project_abilities
   before_filter :authorize_read_project!
   before_filter :authorize_code_access!
   before_filter :require_non_empty_project
-  layout "project"
-
   def show
     @activities = @project.commits_with_refs(20)
   end
-class SnippetsController < ApplicationController
-  before_filter :project
+class SnippetsController < ProjectResourceController
   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 < ProjectResourceController
   # Authorize
-  before_filter :add_project_abilities
   before_filter :authorize_read_project!
   before_filter :authorize_admin_project!, except: [:index, :show]
 # Controller for viewing a repository's file structure
-class TreeController < ApplicationController
+class TreeController < ProjectResourceController
   include ExtractsPath
-  layout "project"
-
-  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
-class WikisController < ApplicationController
-  before_filter :project
-  before_filter :add_project_abilities
+class WikisController < ProjectResourceController
   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")
@@ -1,10 +0,0 @@
-!!! 5
-%html{ lang: "en"}
-  = render "layouts/head"
-  %body{class: "#{app_theme} application"}
-    = render "layouts/flash"
-    = render "layouts/head_panel", title: ""
-    .container
-      .content
-        %center.padded.prepend-top-20
-          = yield
@@ -0,0 +1,10 @@
+!!! 5
+%html{ lang: "en"}
+  = render "layouts/head"
+  %body{class: "#{app_theme} application"}
+    = render "layouts/flash"
+    = render "layouts/head_panel", title: ""
+    .container
+      .content
+        %center.padded.prepend-top-20
+          = yield
@@ -1,41 +0,0 @@
-!!! 5
-%html{ lang: "en"}
-  = render "layouts/head"
-  %body{class: "#{app_theme} project"}
-    = render "layouts/flash"
-    = render "layouts/head_panel", title: @project.name
-    .container
-      %ul.main_menu
-        = nav_link(html_options: {class: "home #{project_tab_class}"}) do
-          = link_to @project.code, project_path(@project), title: "Project"
-
-        - if @project.repo_exists?
-          - if can? current_user, :download_code, @project
-            = nav_link(controller: %w(tree blob blame)) do
-              = link_to 'Files', project_tree_path(@project, @ref || @project.root_ref)
-            = nav_link(controller: %w(commit commits compare repositories protected_branches)) do
-              = link_to "Commits", project_commits_path(@project, @ref || @project.root_ref)
-            = nav_link(path: 'projects#graph') do
-              = link_to "Network", graph_project_path(@project)
-
-        - if @project.issues_enabled
-          = nav_link(controller: %w(issues milestones labels)) do
-            = link_to  project_issues_filter_path(@project)  do
-              Issues
-              %span.count.issue_counter= @project.issues.opened.count
-
-        - if @project.repo_exists? && @project.merge_requests_enabled
-          = nav_link(controller: :merge_requests) do
-            = link_to project_merge_requests_path(@project) do
-              Merge Requests
-              %span.count.merge_counter= @project.merge_requests.opened.count
-
-        - if @project.wall_enabled
-          = nav_link(path: 'projects#wall') do
-            = link_to 'Wall', wall_project_path(@project)
-
-        - if @project.wiki_enabled
-          = nav_link(controller: :wikis) do
-            = link_to 'Wiki', project_wiki_path(@project, :index)
-
-      .content= yield
@@ -0,0 +1,41 @@
+!!! 5
+%html{ lang: "en"}
+  = render "layouts/head"
+  %body{class: "#{app_theme} project"}
+    = render "layouts/flash"
+    = render "layouts/head_panel", title: @project.name
+    .container
+      %ul.main_menu
+        = nav_link(html_options: {class: "home #{project_tab_class}"}) do
+          = link_to @project.code, project_path(@project), title: "Project"
+
+        - if @project.repo_exists?
+          - if can? current_user, :download_code, @project
+            = nav_link(controller: %w(tree blob blame)) do
+              = link_to 'Files', project_tree_path(@project, @ref || @project.root_ref)
+            = nav_link(controller: %w(commit commits compare repositories protected_branches)) do
+              = link_to "Commits", project_commits_path(@project, @ref || @project.root_ref)
+            = nav_link(path: 'projects#graph') do
+              = link_to "Network", graph_project_path(@project)
+
+        - if @project.issues_enabled
+          = nav_link(controller: %w(issues milestones labels)) do
+            = link_to  project_issues_filter_path(@project)  do
+              Issues
+              %span.count.issue_counter= @project.issues.opened.count
+
+        - if @project.repo_exists? && @project.merge_requests_enabled
+          = nav_link(controller: :merge_requests) do
+            = link_to project_merge_requests_path(@project) do
+              Merge Requests
+              %span.count.merge_counter= @project.merge_requests.opened.count
+
+        - if @project.wall_enabled
+          = nav_link(path: 'projects#wall') do
+            = link_to 'Wall', wall_project_path(@project)
+
+        - if @project.wiki_enabled
+          = nav_link(controller: :wikis) do
+            = link_to 'Wiki', project_wiki_path(@project, :index)
+
+      .content= yield
@@ -53,5 +53,9 @@ module Gitlab
     # Add fonts
     config.assets.paths << "#{Rails.root}/app/assets/fonts"
+
+    config.to_prepare do
+      Devise::SessionsController.layout 'devise_layout'
+    end
   end
 end
1	class ErrorsController < ApplicationController	1	class ErrorsController < ApplicationController
2	- layout "error"
3	-
4	def githost	2	def githost
5	render "errors/gitolite"	3	render "errors/gitolite"
6	end	4	end
1	class ProfileController < ApplicationController	1	class ProfileController < ApplicationController
2	- layout "profile"
3	before_filter :user	2	before_filter :user
4		3
5	def show	4	def show
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class ProjectResourceController < ApplicationController
	2	+ before_filter :project
	3	+ # Authorize
	4	+ before_filter :add_project_abilities
	5	+end
	@@ -1,10 +0,0 @@	@@ -1,10 +0,0 @@
1	-!!! 5
2	-%html{ lang: "en"}
3	- = render "layouts/head"
4	- %body{class: "#{app_theme} application"}
5	- = render "layouts/flash"
6	- = render "layouts/head_panel", title: ""
7	- .container
8	- .content
9	- %center.padded.prepend-top-20
10	- = yield
@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
	1	+!!! 5
	2	+%html{ lang: "en"}
	3	+ = render "layouts/head"
	4	+ %body{class: "#{app_theme} application"}
	5	+ = render "layouts/flash"
	6	+ = render "layouts/head_panel", title: ""
	7	+ .container
	8	+ .content
	9	+ %center.padded.prepend-top-20
	10	+ = yield
	@@ -1,41 +0,0 @@	@@ -1,41 +0,0 @@
1	-!!! 5
2	-%html{ lang: "en"}
3	- = render "layouts/head"
4	- %body{class: "#{app_theme} project"}
5	- = render "layouts/flash"
6	- = render "layouts/head_panel", title: @project.name
7	- .container
8	- %ul.main_menu
9	- = nav_link(html_options: {class: "home #{project_tab_class}"}) do
10	- = link_to @project.code, project_path(@project), title: "Project"
11	-
12	- - if @project.repo_exists?
13	- - if can? current_user, :download_code, @project
14	- = nav_link(controller: %w(tree blob blame)) do
15	- = link_to 'Files', project_tree_path(@project, @ref \|\| @project.root_ref)
16	- = nav_link(controller: %w(commit commits compare repositories protected_branches)) do
17	- = link_to "Commits", project_commits_path(@project, @ref \|\| @project.root_ref)
18	- = nav_link(path: 'projects#graph') do
19	- = link_to "Network", graph_project_path(@project)
20	-
21	- - if @project.issues_enabled
22	- = nav_link(controller: %w(issues milestones labels)) do
23	- = link_to project_issues_filter_path(@project) do
24	- Issues
25	- %span.count.issue_counter= @project.issues.opened.count
26	-
27	- - if @project.repo_exists? && @project.merge_requests_enabled
28	- = nav_link(controller: :merge_requests) do
29	- = link_to project_merge_requests_path(@project) do
30	- Merge Requests
31	- %span.count.merge_counter= @project.merge_requests.opened.count
32	-
33	- - if @project.wall_enabled
34	- = nav_link(path: 'projects#wall') do
35	- = link_to 'Wall', wall_project_path(@project)
36	-
37	- - if @project.wiki_enabled
38	- = nav_link(controller: :wikis) do
39	- = link_to 'Wiki', project_wiki_path(@project, :index)
40	-
41	- .content= yield
@@ -0,0 +1,41 @@		@@ -0,0 +1,41 @@
	1	+!!! 5
	2	+%html{ lang: "en"}
	3	+ = render "layouts/head"
	4	+ %body{class: "#{app_theme} project"}
	5	+ = render "layouts/flash"
	6	+ = render "layouts/head_panel", title: @project.name
	7	+ .container
	8	+ %ul.main_menu
	9	+ = nav_link(html_options: {class: "home #{project_tab_class}"}) do
	10	+ = link_to @project.code, project_path(@project), title: "Project"
	11	+
	12	+ - if @project.repo_exists?
	13	+ - if can? current_user, :download_code, @project
	14	+ = nav_link(controller: %w(tree blob blame)) do
	15	+ = link_to 'Files', project_tree_path(@project, @ref \|\| @project.root_ref)
	16	+ = nav_link(controller: %w(commit commits compare repositories protected_branches)) do
	17	+ = link_to "Commits", project_commits_path(@project, @ref \|\| @project.root_ref)
	18	+ = nav_link(path: 'projects#graph') do
	19	+ = link_to "Network", graph_project_path(@project)
	20	+
	21	+ - if @project.issues_enabled
	22	+ = nav_link(controller: %w(issues milestones labels)) do
	23	+ = link_to project_issues_filter_path(@project) do
	24	+ Issues
	25	+ %span.count.issue_counter= @project.issues.opened.count
	26	+
	27	+ - if @project.repo_exists? && @project.merge_requests_enabled
	28	+ = nav_link(controller: :merge_requests) do
	29	+ = link_to project_merge_requests_path(@project) do
	30	+ Merge Requests
	31	+ %span.count.merge_counter= @project.merge_requests.opened.count
	32	+
	33	+ - if @project.wall_enabled
	34	+ = nav_link(path: 'projects#wall') do
	35	+ = link_to 'Wall', wall_project_path(@project)
	36	+
	37	+ - if @project.wiki_enabled
	38	+ = nav_link(controller: :wikis) do
	39	+ = link_to 'Wiki', project_wiki_path(@project, :index)
	40	+
	41	+ .content= yield