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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
0125b74b
Commit
0125b74b
authored
Jan 26, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix application crashes after #2772
parent
71e89df5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
app/controllers/admin/users_controller.rb
app/controllers/admin/users_controller.rb
+5
-6
config/routes.rb
config/routes.rb
+1
-1
No files found.
app/controllers/admin/users_controller.rb
View file @
0125b74b
class
Admin::UsersController
<
Admin
::
ApplicationController
class
Admin::UsersController
<
Admin
::
ApplicationController
before_filter
:admin_user
,
only:
[
:show
,
:edit
,
:update
,
:destroy
]
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
])
...
@@ -7,11 +9,8 @@ class Admin::UsersController < Admin::ApplicationController
...
@@ -7,11 +9,8 @@ class Admin::UsersController < Admin::ApplicationController
end
end
def
show
def
show
projects
=
if
admin_user
.
authorized_projects
.
empty?
@projects
=
Project
.
scoped
Project
@projects
=
@projects
.
without_user
(
admin_user
)
if
admin_user
.
authorized_projects
.
empty?
else
Project
.
without_user
(
admin_user
)
end
.
all
end
end
def
team_update
def
team_update
...
@@ -102,6 +101,6 @@ class Admin::UsersController < Admin::ApplicationController
...
@@ -102,6 +101,6 @@ class Admin::UsersController < Admin::ApplicationController
protected
protected
def
admin_user
def
admin_user
@admin_user
||=
User
.
find_by_username
(
params
[
:id
])
@admin_user
||=
User
.
find_by_username
!
(
params
[
:id
])
end
end
end
end
config/routes.rb
View file @
0125b74b
...
@@ -49,7 +49,7 @@ Gitlab::Application.routes.draw do
...
@@ -49,7 +49,7 @@ Gitlab::Application.routes.draw do
# Admin Area
# Admin Area
#
#
namespace
:admin
do
namespace
:admin
do
resources
:users
do
resources
:users
,
constraints:
{
id:
/[a-zA-Z.\/0-9_\-]+/
}
do
member
do
member
do
put
:team_update
put
:team_update
put
:block
put
:block
...
...
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