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
8d544645
Commit
8d544645
authored
Mar 21, 2016
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add specs and add visibility level to admin groups
parent
261569b2
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
110 additions
and
29 deletions
+110
-29
app/controllers/admin/groups_controller.rb
app/controllers/admin/groups_controller.rb
+1
-1
app/finders/group_projects_finder.rb
app/finders/group_projects_finder.rb
+2
-3
app/views/admin/groups/_form.html.haml
app/views/admin/groups/_form.html.haml
+2
-0
app/views/admin/groups/index.html.haml
app/views/admin/groups/index.html.haml
+3
-0
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+5
-0
db/migrate/20160301124843_add_visibility_level_to_groups.rb
db/migrate/20160301124843_add_visibility_level_to_groups.rb
+7
-1
db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb
...3_add_default_group_visibility_to_application_settings.rb
+0
-22
db/schema.rb
db/schema.rb
+1
-2
spec/finders/group_projects_finder_spec.rb
spec/finders/group_projects_finder_spec.rb
+89
-0
No files found.
app/controllers/admin/groups_controller.rb
View file @
8d544645
...
@@ -59,6 +59,6 @@ class Admin::GroupsController < Admin::ApplicationController
...
@@ -59,6 +59,6 @@ class Admin::GroupsController < Admin::ApplicationController
end
end
def
group_params
def
group_params
params
.
require
(
:group
).
permit
(
:name
,
:description
,
:path
,
:avatar
)
params
.
require
(
:group
).
permit
(
:name
,
:description
,
:path
,
:avatar
,
:visibility_level
)
end
end
end
end
app/finders/group_projects_finder.rb
View file @
8d544645
class
GroupProjectsFinder
<
UnionFinder
class
GroupProjectsFinder
<
UnionFinder
def
initialize
(
group
,
options
=
{})
def
initialize
(
group
,
options
=
{})
@group
=
group
@group
=
group
@options
=
options
@options
=
options
end
end
def
execute
(
current_user
=
nil
)
def
execute
(
current_user
=
nil
)
segments
=
group_projects
(
current_user
)
segments
=
group_projects
(
current_user
)
find_union
(
segments
,
Project
)
find_union
(
segments
,
Project
)
end
end
private
private
def
group_projects
(
current_user
)
def
group_projects
(
current_user
)
only_owned
=
@options
.
fetch
(
:only_owned
,
false
)
only_owned
=
@options
.
fetch
(
:only_owned
,
false
)
only_shared
=
@options
.
fetch
(
:only_shared
,
false
)
only_shared
=
@options
.
fetch
(
:only_shared
,
false
)
projects
=
[]
projects
=
[]
...
...
app/views/admin/groups/_form.html.haml
View file @
8d544645
...
@@ -10,6 +10,8 @@
...
@@ -10,6 +10,8 @@
.col-sm-10
.col-sm-10
=
render
'shared/choose_group_avatar_button'
,
f:
f
=
render
'shared/choose_group_avatar_button'
,
f:
f
=
render
'shared/visibility_level'
,
f:
f
,
visibility_level:
@group
.
visibility_level
,
can_change_visibility_level:
can_change_group_visibility_level?
(
@group
),
form_model:
@group
-
if
@group
.
new_record?
-
if
@group
.
new_record?
.form-group
.form-group
.col-sm-offset-2.col-sm-10
.col-sm-offset-2.col-sm-10
...
...
app/views/admin/groups/index.html.haml
View file @
8d544645
...
@@ -46,6 +46,9 @@
...
@@ -46,6 +46,9 @@
%h4
%h4
=
link_to
[
:admin
,
group
]
do
=
link_to
[
:admin
,
group
]
do
%span
{
class:
visibility_level_color
(
group
.
visibility_level
)
}
=
visibility_level_icon
(
group
.
visibility_level
)
%i
.fa.fa-folder
%i
.fa.fa-folder
=
group
.
name
=
group
.
name
...
...
app/views/admin/groups/show.html.haml
View file @
8d544645
...
@@ -27,6 +27,11 @@
...
@@ -27,6 +27,11 @@
%strong
%strong
=
@group
.
description
=
@group
.
description
%li
%span
.light
Visibility level:
%strong
=
visibility_level_label
(
@group
.
visibility_level
)
%li
%li
%span
.light
Created on:
%span
.light
Created on:
%strong
%strong
...
...
db/migrate/20160301124843_add_visibility_level_to_groups.rb
View file @
8d544645
class
AddVisibilityLevelToGroups
<
ActiveRecord
::
Migration
class
AddVisibilityLevelToGroups
<
ActiveRecord
::
Migration
def
change
def
change
#All groups public by default
#All groups public by default
add_column
:namespaces
,
:visibility_level
,
:integer
,
null:
false
,
default:
20
add_column
:namespaces
,
:visibility_level
,
:integer
,
null:
false
,
default:
allowed_visibility_level
end
def
allowed_visibility_level
# TODO: Don't use `current_application_settings`
allowed_levels
=
Gitlab
::
VisibilityLevel
.
values
-
current_application_settings
.
restricted_visibility_levels
allowed_levels
.
max
end
end
end
end
db/migrate/20160308212903_add_default_group_visibility_to_application_settings.rb
deleted
100644 → 0
View file @
261569b2
#Create visibility level field on DB
#Sets default_visibility_level to value on settings if not restricted
#If value is restricted takes higher visibility level allowed
class
AddDefaultGroupVisibilityToApplicationSettings
<
ActiveRecord
::
Migration
def
up
add_column
:application_settings
,
:default_group_visibility
,
:integer
execute
(
"UPDATE application_settings SET default_group_visibility =
#{
allowed_visibility_level
}
"
)
end
def
down
remove_column
:application_settings
,
:default_group_visibility
end
private
def
allowed_visibility_level
# TODO: Don't use `current_application_settings`
allowed_levels
=
Gitlab
::
VisibilityLevel
.
values
-
current_application_settings
.
restricted_visibility_levels
allowed_levels
.
max
end
end
db/schema.rb
View file @
8d544645
...
@@ -77,7 +77,6 @@ ActiveRecord::Schema.define(version: 20160320204112) do
...
@@ -77,7 +77,6 @@ ActiveRecord::Schema.define(version: 20160320204112) do
t
.
boolean
"akismet_enabled"
,
default:
false
t
.
boolean
"akismet_enabled"
,
default:
false
t
.
string
"akismet_api_key"
t
.
string
"akismet_api_key"
t
.
boolean
"email_author_in_body"
,
default:
false
t
.
boolean
"email_author_in_body"
,
default:
false
t
.
integer
"default_group_visibility"
end
end
create_table
"audit_events"
,
force: :cascade
do
|
t
|
create_table
"audit_events"
,
force: :cascade
do
|
t
|
...
@@ -417,7 +416,7 @@ ActiveRecord::Schema.define(version: 20160320204112) do
...
@@ -417,7 +416,7 @@ ActiveRecord::Schema.define(version: 20160320204112) do
t
.
string
"state"
t
.
string
"state"
t
.
integer
"iid"
t
.
integer
"iid"
t
.
integer
"updated_by_id"
t
.
integer
"updated_by_id"
t
.
boolean
"confidential"
,
default:
false
t
.
boolean
"confidential"
,
default:
false
end
end
add_index
"issues"
,
[
"assignee_id"
],
name:
"index_issues_on_assignee_id"
,
using: :btree
add_index
"issues"
,
[
"assignee_id"
],
name:
"index_issues_on_assignee_id"
,
using: :btree
...
...
spec/finders/group_projects_finder_spec.rb
0 → 100644
View file @
8d544645
require
'spec_helper'
describe
GroupProjectsFinder
do
let
(
:group
)
{
create
(
:group
)
}
let
(
:current_user
)
{
create
(
:user
)
}
let
(
:finder
)
{
described_class
.
new
(
source_user
)
}
let!
(
:public_project
)
{
create
(
:project
,
:public
,
group:
group
,
path:
'1'
)
}
let!
(
:private_project
)
{
create
(
:project
,
:private
,
group:
group
,
path:
'2'
)
}
let!
(
:shared_project_1
)
{
create
(
:project
,
:public
,
path:
'3'
)
}
let!
(
:shared_project_2
)
{
create
(
:project
,
:private
,
path:
'4'
)
}
let!
(
:shared_project_3
)
{
create
(
:project
,
:internal
,
path:
'5'
)
}
before
do
shared_project_1
.
project_group_links
.
create
(
group_access:
Gitlab
::
Access
::
MASTER
,
group:
group
)
shared_project_2
.
project_group_links
.
create
(
group_access:
Gitlab
::
Access
::
MASTER
,
group:
group
)
shared_project_3
.
project_group_links
.
create
(
group_access:
Gitlab
::
Access
::
MASTER
,
group:
group
)
end
describe
'with a group member current user'
do
before
{
group
.
add_user
(
current_user
,
Gitlab
::
Access
::
MASTER
)
}
context
"only shared"
do
subject
{
described_class
.
new
(
group
,
only_shared:
true
).
execute
(
current_user
)
}
it
{
is_expected
.
to
eq
([
shared_project_3
,
shared_project_2
,
shared_project_1
])
}
end
context
"only owned"
do
subject
{
described_class
.
new
(
group
,
only_owned:
true
).
execute
(
current_user
)
}
it
{
is_expected
.
to
eq
([
private_project
,
public_project
])
}
end
context
"all"
do
subject
{
described_class
.
new
(
group
).
execute
(
current_user
)
}
it
{
is_expected
.
to
eq
([
shared_project_3
,
shared_project_2
,
shared_project_1
,
private_project
,
public_project
])
}
end
end
describe
'without group member current_user'
do
before
{
shared_project_2
.
team
<<
[
current_user
,
Gitlab
::
Access
::
MASTER
]
}
context
"only shared"
do
context
"without external user"
do
subject
{
described_class
.
new
(
group
,
only_shared:
true
).
execute
(
current_user
)
}
it
{
is_expected
.
to
eq
([
shared_project_3
,
shared_project_2
,
shared_project_1
])
}
end
context
"with external user"
do
before
{
current_user
.
update_attributes
(
external:
true
)
}
subject
{
described_class
.
new
(
group
,
only_shared:
true
).
execute
(
current_user
)
}
it
{
is_expected
.
to
eq
([
shared_project_2
,
shared_project_1
])
}
end
end
context
"only owned"
do
context
"without external user"
do
before
{
private_project
.
team
<<
[
current_user
,
Gitlab
::
Access
::
MASTER
]
}
subject
{
described_class
.
new
(
group
,
only_owned:
true
).
execute
(
current_user
)
}
it
{
is_expected
.
to
eq
([
private_project
,
public_project
])
}
end
context
"with external user"
do
before
{
current_user
.
update_attributes
(
external:
true
)
}
subject
{
described_class
.
new
(
group
,
only_owned:
true
).
execute
(
current_user
)
}
it
{
is_expected
.
to
eq
([
public_project
])
}
end
context
"all"
do
subject
{
described_class
.
new
(
group
).
execute
(
current_user
)
}
it
{
is_expected
.
to
eq
([
shared_project_3
,
shared_project_2
,
shared_project_1
,
public_project
])
}
end
end
end
describe
"no user"
do
context
"only shared"
do
subject
{
described_class
.
new
(
group
,
only_shared:
true
).
execute
(
current_user
)
}
it
{
is_expected
.
to
eq
([
shared_project_3
,
shared_project_1
])
}
end
context
"only owned"
do
subject
{
described_class
.
new
(
group
,
only_owned:
true
).
execute
(
current_user
)
}
it
{
is_expected
.
to
eq
([
public_project
])
}
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