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
149ccd5d
Commit
149ccd5d
authored
Feb 01, 2013
by
Christian Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix groups api: differ between users and admin
parent
fc0c6928
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
50 additions
and
44 deletions
+50
-44
lib/api/entities.rb
lib/api/entities.rb
+1
-1
lib/api/groups.rb
lib/api/groups.rb
+49
-43
No files found.
lib/api/entities.rb
View file @
149ccd5d
...
...
@@ -33,7 +33,7 @@ module Gitlab
end
class
Group
<
Grape
::
Entity
expose
:id
,
:name
,
:path
,
:
name
,
:owner_id
,
:type
expose
:id
,
:name
,
:path
,
:
owner_id
end
class
GroupDetail
<
Grape
::
Entity
...
...
lib/api/groups.rb
View file @
149ccd5d
...
...
@@ -2,49 +2,55 @@ module Gitlab
# groups API
class
Groups
<
Grape
::
API
before
{
authenticate!
}
resource
:groups
do
# Get a groups list
#
# Example Request:
# GET /groups
get
do
@groups
=
paginate
Group
present
@groups
,
with:
Entities
::
Group
end
# Create group. Available only for admin
#
# Parameters:
# name (required) - Name
# path (required) - Path
# Example Request:
# POST /groups
post
do
authenticated_as_admin!
attrs
=
attributes_for_keys
[
:name
,
:path
]
@group
=
Group
.
new
(
attrs
)
@group
.
owner
=
current_user
if
@group
.
save
present
@group
,
with:
Entities
::
Group
else
not_found!
end
end
# Get a single group, with containing projects
#
# Parameters:
# id (required) - The ID of a group
# Example Request:
# GET /groups/:id
get
":id"
do
@group
=
Group
.
find
(
params
[
:id
])
present
@group
,
with:
Entities
::
GroupDetail
end
end
resource
:groups
do
# Get a groups list
#
# Example Request:
# GET /groups
get
do
if
current_user
.
admin
@groups
=
paginate
Group
else
@groups
=
paginate
current_user
.
groups
end
present
@groups
,
with:
Entities
::
Group
end
# Create group. Available only for admin
#
# Parameters:
# name (required) - Name
# path (required) - Path
# Example Request:
# POST /groups
post
do
authenticated_as_admin!
attrs
=
attributes_for_keys
[
:name
,
:path
]
@group
=
Group
.
new
(
attrs
)
@group
.
owner
=
current_user
if
@group
.
save
present
@group
,
with:
Entities
::
Group
else
not_found!
end
end
# Get a single group, with containing projects
#
# Parameters:
# id (required) - The ID of a group
# Example Request:
# GET /groups/:id
get
":id"
do
@group
=
Group
.
find
(
params
[
:id
])
if
current_user
.
admin
or
current_user
.
groups
.
include?
@group
present
@group
,
with:
Entities
::
GroupDetail
else
not_found!
end
end
end
end
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