kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix determine of layout for group/team

This commit is contained in:
Dmitriy Zaporozhets 2013-06-08 16:26:57 +03:00
parent 08e52a5624
commit 590c84c7a4
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/groups_controller.rb
View File

@ -1,7 +1,5 @@
class GroupsController < ApplicationController class GroupsController < ApplicationController
respond_to :html respond_to :html
layout 'group', except: [:new, :create]
before_filter :group, except: [:new, :create] before_filter :group, except: [:new, :create]
# Authorize # Authorize
@ -12,7 +10,8 @@ class GroupsController < ApplicationController
# Load group projects # Load group projects
before_filter :projects, except: [:new, :create] before_filter :projects, except: [:new, :create]
layout 'navless', only: [:new, :create] layout :determine_layout
before_filter :set_title, only: [:new, :create] before_filter :set_title, only: [:new, :create]
def new def new
@ -141,4 +140,12 @@ class GroupsController < ApplicationController
def set_title def set_title
@title = 'New Group' @title = 'New Group'
end end
def determine_layout
if [:new, :create].include?(action_name.to_sym)
'navless'
else
'group'
end
end
end end

12
app/controllers/teams_controller.rb
View File

@ -6,8 +6,8 @@ class TeamsController < ApplicationController
before_filter :user_team, except: [:new, :create] before_filter :user_team, except: [:new, :create]
layout 'user_team', except: [:new, :create] layout :determine_layout
layout 'navless', only: [:new, :create]
before_filter :set_title, only: [:new, :create] before_filter :set_title, only: [:new, :create]
def show def show
@ -82,4 +82,12 @@ class TeamsController < ApplicationController
def set_title def set_title
@title = 'New Team' @title = 'New Team'
end end
def determine_layout
if [:new, :create].include?(action_name.to_sym)
'navless'
else
'user_team'
end
end
end end