Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
925183ed
Commit
925183ed
authored
Sep 16, 2012
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add an AdminController base class for Admin controllers
Handles stuff that's shared across admin controllers.
parent
83f24de3
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
27 additions
and
44 deletions
+27
-44
app/controllers/admin/dashboard_controller.rb
app/controllers/admin/dashboard_controller.rb
+1
-5
app/controllers/admin/hooks_controller.rb
app/controllers/admin/hooks_controller.rb
+2
-6
app/controllers/admin/logs_controller.rb
app/controllers/admin/logs_controller.rb
+1
-5
app/controllers/admin/projects_controller.rb
app/controllers/admin/projects_controller.rb
+3
-6
app/controllers/admin/resque_controller.rb
app/controllers/admin/resque_controller.rb
+2
-3
app/controllers/admin/team_members_controller.rb
app/controllers/admin/team_members_controller.rb
+1
-5
app/controllers/admin/users_controller.rb
app/controllers/admin/users_controller.rb
+6
-10
app/controllers/admin_controller.rb
app/controllers/admin_controller.rb
+11
-0
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+0
-4
No files found.
app/controllers/admin/dashboard_controller.rb
View file @
925183ed
class
Admin::DashboardController
<
ApplicationController
layout
"admin"
before_filter
:authenticate_user!
before_filter
:authenticate_admin!
class
Admin::DashboardController
<
AdminController
def
index
@workers
=
Resque
.
workers
@pending_jobs
=
Resque
.
size
(
:post_receive
)
...
...
app/controllers/admin/hooks_controller.rb
View file @
925183ed
class
Admin::HooksController
<
ApplicationController
layout
"admin"
before_filter
:authenticate_user!
before_filter
:authenticate_admin!
class
Admin::HooksController
<
AdminController
def
index
@hooks
=
SystemHook
.
all
@hook
=
SystemHook
.
new
...
...
@@ -15,7 +11,7 @@ class Admin::HooksController < ApplicationController
redirect_to
admin_hooks_path
,
notice:
'Hook was successfully created.'
else
@hooks
=
SystemHook
.
all
render
:index
render
:index
end
end
...
...
app/controllers/admin/logs_controller.rb
View file @
925183ed
class
Admin::LogsController
<
ApplicationController
layout
"admin"
before_filter
:authenticate_user!
before_filter
:authenticate_admin!
class
Admin::LogsController
<
AdminController
end
app/controllers/admin/projects_controller.rb
View file @
925183ed
class
Admin::ProjectsController
<
ApplicationController
layout
"admin"
before_filter
:authenticate_user!
before_filter
:authenticate_admin!
class
Admin::ProjectsController
<
AdminController
before_filter
:admin_project
,
only:
[
:edit
,
:show
,
:update
,
:destroy
,
:team_update
]
def
index
...
...
@@ -43,7 +40,7 @@ class Admin::ProjectsController < ApplicationController
def
update
owner_id
=
params
[
:project
].
delete
(
:owner_id
)
if
owner_id
if
owner_id
@admin_project
.
owner
=
User
.
find
(
owner_id
)
end
...
...
@@ -60,7 +57,7 @@ class Admin::ProjectsController < ApplicationController
redirect_to
admin_projects_url
,
notice:
'Project was successfully deleted.'
end
private
private
def
admin_project
@admin_project
=
Project
.
find_by_code
(
params
[
:id
])
...
...
app/controllers/admin/resque_controller.rb
View file @
925183ed
class
Admin::ResqueController
<
ApplicationController
layout
'admin'
class
Admin::ResqueController
<
AdminController
def
show
end
end
\ No newline at end of file
end
app/controllers/admin/team_members_controller.rb
View file @
925183ed
class
Admin::TeamMembersController
<
ApplicationController
layout
"admin"
before_filter
:authenticate_user!
before_filter
:authenticate_admin!
class
Admin::TeamMembersController
<
AdminController
def
edit
@admin_team_member
=
UsersProject
.
find
(
params
[
:id
])
end
...
...
app/controllers/admin/users_controller.rb
View file @
925183ed
class
Admin::UsersController
<
ApplicationController
layout
"admin"
before_filter
:authenticate_user!
before_filter
:authenticate_admin!
class
Admin::UsersController
<
AdminController
def
index
@admin_users
=
User
.
scoped
@admin_users
=
@admin_users
.
filter
(
params
[
:filter
])
...
...
@@ -24,7 +20,7 @@ class Admin::UsersController < ApplicationController
@admin_user
=
User
.
find
(
params
[
:id
])
UsersProject
.
user_bulk_import
(
@admin_user
,
@admin_user
,
params
[
:project_ids
],
params
[
:project_access
]
)
...
...
@@ -41,22 +37,22 @@ class Admin::UsersController < ApplicationController
@admin_user
=
User
.
find
(
params
[
:id
])
end
def
block
def
block
@admin_user
=
User
.
find
(
params
[
:id
])
if
@admin_user
.
block
redirect_to
:back
,
alert:
"Successfully blocked"
else
else
redirect_to
:back
,
alert:
"Error occured. User was not blocked"
end
end
def
unblock
def
unblock
@admin_user
=
User
.
find
(
params
[
:id
])
if
@admin_user
.
update_attribute
(
:blocked
,
false
)
redirect_to
:back
,
alert:
"Successfully unblocked"
else
else
redirect_to
:back
,
alert:
"Error occured. User was not unblocked"
end
end
...
...
app/controllers/admin_controller.rb
0 → 100644
View file @
925183ed
# Provides a base class for Admin controllers to subclass
#
# Automatically sets the layout and ensures an administrator is logged in
class
AdminController
<
ApplicationController
layout
'admin'
before_filter
:authenticate_admin!
def
authenticate_admin!
return
render_404
unless
current_user
.
is_admin?
end
end
app/controllers/application_controller.rb
View file @
925183ed
...
...
@@ -84,10 +84,6 @@ class ApplicationController < ActionController::Base
abilities
<<
Ability
end
def
authenticate_admin!
return
render_404
unless
current_user
.
is_admin?
end
def
authorize_project!
(
action
)
return
access_denied!
unless
can?
(
current_user
,
action
,
project
)
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment