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

Added the correct hierarchy of controllers for the administrative part

Browse source
This commit is contained in:
Andrey Kumanyaev 2013-01-20 15:20:50 +04:00 committed by Dmitriy Zaporozhets
parent 2984716870
commit 9d318db48f
10 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin_controller.rb → app/controllers/admin/application_controller.rb
View file

@ -1,7 +1,7 @@
# Provides a base class for Admin controllers to subclass # Provides a base class for Admin controllers to subclass
# #
# Automatically sets the layout and ensures an administrator is logged in # Automatically sets the layout and ensures an administrator is logged in
class AdminController < ApplicationController class Admin::ApplicationController < ApplicationController
layout 'admin' layout 'admin'
before_filter :authenticate_admin! before_filter :authenticate_admin!

2
app/controllers/admin/dashboard_controller.rb
View file

@ -1,4 +1,4 @@
class Admin::DashboardController < AdminController class Admin::DashboardController < Admin::ApplicationController
def index def index
@projects = Project.order("created_at DESC").limit(10) @projects = Project.order("created_at DESC").limit(10)
@users = User.order("created_at DESC").limit(10) @users = User.order("created_at DESC").limit(10)

2
app/controllers/admin/groups_controller.rb
View file

@ -1,4 +1,4 @@
class Admin::GroupsController < AdminController class Admin::GroupsController < Admin::ApplicationController
before_filter :group, only: [:edit, :show, :update, :destroy, :project_update, :project_teams_update] before_filter :group, only: [:edit, :show, :update, :destroy, :project_update, :project_teams_update]
def index def index

2
app/controllers/admin/hooks_controller.rb
View file

@ -1,4 +1,4 @@
class Admin::HooksController < AdminController class Admin::HooksController < Admin::ApplicationController
def index def index
@hooks = SystemHook.all @hooks = SystemHook.all
@hook = SystemHook.new @hook = SystemHook.new

2
app/controllers/admin/logs_controller.rb
View file

@ -1,2 +1,2 @@
class Admin::LogsController < AdminController class Admin::LogsController < Admin::ApplicationController
end end

2
app/controllers/admin/projects_controller.rb
View file

@ -1,4 +1,4 @@
class Admin::ProjectsController < AdminController class Admin::ProjectsController < Admin::ApplicationController
before_filter :project, only: [:edit, :show, :update, :destroy, :team_update] before_filter :project, only: [:edit, :show, :update, :destroy, :team_update]
def index def index

2
app/controllers/admin/resque_controller.rb
View file

@ -1,4 +1,4 @@
class Admin::ResqueController < AdminController class Admin::ResqueController < Admin::ApplicationController
def show def show
end end
end end

2
app/controllers/admin/team_members_controller.rb
View file

@ -1,4 +1,4 @@
class Admin::TeamMembersController < AdminController class Admin::TeamMembersController < Admin::ApplicationController
def edit def edit
@admin_team_member = UsersProject.find(params[:id]) @admin_team_member = UsersProject.find(params[:id])
end end

2
app/controllers/admin/teams_controller.rb
View file

@ -1,4 +1,4 @@
class Admin::TeamsController < AdminController class Admin::TeamsController < Admin::ApplicationController
before_filter :user_team, before_filter :user_team,
only: [ :edit, :show, :update, :destroy, only: [ :edit, :show, :update, :destroy,
:delegate_projects, :relegate_project, :delegate_projects, :relegate_project,

2
app/controllers/admin/users_controller.rb
View file

@ -1,4 +1,4 @@
class Admin::UsersController < AdminController class Admin::UsersController < Admin::ApplicationController
def index def index
@admin_users = User.scoped @admin_users = User.scoped
@admin_users = @admin_users.filter(params[:filter]) @admin_users = @admin_users.filter(params[:filter])