BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 9d318db4 by Andrey Kumanyaev Committed by Dmitriy Zaporozhets
Options

Added the correct hierarchy of controllers for the administrative part

parent 29847168
Showing with 10 additions and 10 deletions
app/controllers/admin_controller.rb → app/controllers/admin/application_controller.rb
# 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!
......
app/controllers/admin/dashboard_controller.rb
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)
......
app/controllers/admin/groups_controller.rb
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
......
app/controllers/admin/hooks_controller.rb
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
......
app/controllers/admin/logs_controller.rb
class Admin::LogsController < AdminController class Admin::LogsController < Admin::ApplicationController
end end
app/controllers/admin/projects_controller.rb
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
......
app/controllers/admin/resque_controller.rb
class Admin::ResqueController < AdminController class Admin::ResqueController < Admin::ApplicationController
def show def show
end end
end end
app/controllers/admin/team_members_controller.rb
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
......
app/controllers/admin/teams_controller.rb
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,
......
app/controllers/admin/users_controller.rb
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])
......
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