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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
e245d7ee
Commit
e245d7ee
authored
Jun 06, 2017
by
Mike Greiling
Committed by
Phil Hughes
Jun 06, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "When changing project visibility setting, change other dropdowns automatically"
parent
17feb2fa
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
95 additions
and
17 deletions
+95
-17
app/assets/javascripts/project_new.js
app/assets/javascripts/project_new.js
+59
-4
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+14
-0
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+7
-3
app/helpers/visibility_level_helper.rb
app/helpers/visibility_level_helper.rb
+2
-2
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+3
-3
changelogs/unreleased/24032-when-changing-project-visibility-setting-change-other-dropdowns-automatically.yml
...sibility-setting-change-other-dropdowns-automatically.yml
+4
-0
spec/features/projects/settings/visibility_settings_spec.rb
spec/features/projects/settings/visibility_settings_spec.rb
+2
-2
spec/helpers/projects_helper_spec.rb
spec/helpers/projects_helper_spec.rb
+2
-2
spec/helpers/visibility_level_helper_spec.rb
spec/helpers/visibility_level_helper_spec.rb
+1
-1
No files found.
app/assets/javascripts/project_new.js
View file @
e245d7ee
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, no-unused-vars, one-var, no-underscore-dangle, prefer-template, no-else-return, prefer-arrow-callback, max-len */
function
highlightChanges
(
$elm
)
{
$elm
.
addClass
(
'
highlight-changes
'
);
setTimeout
(()
=>
$elm
.
removeClass
(
'
highlight-changes
'
),
10
);
}
(
function
()
{
this
.
ProjectNew
=
(
function
()
{
function
ProjectNew
()
{
this
.
toggleSettings
=
this
.
toggleSettings
.
bind
(
this
);
this
.
$selects
=
$
(
'
.features select
'
);
this
.
$repoSelects
=
this
.
$selects
.
filter
(
'
.js-repo-select
'
);
this
.
$projectSelects
=
this
.
$selects
.
not
(
'
.js-repo-select
'
);
$
(
'
.project-edit-container
'
).
on
(
'
ajax:before
'
,
(
function
(
_this
)
{
return
function
()
{
...
...
@@ -26,6 +32,42 @@
if
(
!
visibilityContainer
)
return
;
const
visibilitySelect
=
new
gl
.
VisibilitySelect
(
visibilityContainer
);
visibilitySelect
.
init
();
const
$visibilitySelect
=
$
(
visibilityContainer
).
find
(
'
select
'
);
let
projectVisibility
=
$visibilitySelect
.
val
();
const
PROJECT_VISIBILITY_PRIVATE
=
'
0
'
;
$visibilitySelect
.
on
(
'
change
'
,
()
=>
{
const
newProjectVisibility
=
$visibilitySelect
.
val
();
if
(
projectVisibility
!==
newProjectVisibility
)
{
this
.
$projectSelects
.
each
((
idx
,
select
)
=>
{
const
$select
=
$
(
select
);
const
$options
=
$select
.
find
(
'
option
'
);
const
values
=
$
.
map
(
$options
,
e
=>
e
.
value
);
// if switched to "private", limit visibility options
if
(
newProjectVisibility
===
PROJECT_VISIBILITY_PRIVATE
)
{
if
(
$select
.
val
()
!==
values
[
0
]
&&
$select
.
val
()
!==
values
[
1
])
{
$select
.
val
(
values
[
1
]).
trigger
(
'
change
'
);
highlightChanges
(
$select
);
}
$options
.
slice
(
2
).
disable
();
}
// if switched from "private", increase visibility for non-disabled options
if
(
projectVisibility
===
PROJECT_VISIBILITY_PRIVATE
)
{
$options
.
enable
();
if
(
$select
.
val
()
!==
values
[
0
]
&&
$select
.
val
()
!==
values
[
values
.
length
-
1
])
{
$select
.
val
(
values
[
values
.
length
-
1
]).
trigger
(
'
change
'
);
highlightChanges
(
$select
);
}
}
});
projectVisibility
=
newProjectVisibility
;
}
});
};
ProjectNew
.
prototype
.
toggleSettings
=
function
()
{
...
...
@@ -56,8 +98,10 @@
ProjectNew
.
prototype
.
toggleRepoVisibility
=
function
()
{
var
$repoAccessLevel
=
$
(
'
.js-repo-access-level select
'
);
var
$lfsEnabledOption
=
$
(
'
.js-lfs-enabled select
'
);
var
containerRegistry
=
document
.
querySelectorAll
(
'
.js-container-registry
'
)[
0
];
var
containerRegistryCheckbox
=
document
.
getElementById
(
'
project_container_registry_enabled
'
);
var
prevSelectedVal
=
parseInt
(
$repoAccessLevel
.
val
(),
10
);
this
.
$repoSelects
.
find
(
"
option[value='
"
+
$repoAccessLevel
.
val
()
+
"
']
"
)
.
nextAll
()
...
...
@@ -71,29 +115,40 @@
var
$this
=
$
(
this
);
var
repoSelectVal
=
parseInt
(
$this
.
val
(),
10
);
$this
.
find
(
'
option
'
).
show
();
$this
.
find
(
'
option
'
).
enable
();
if
(
selectedVal
<
repoSelectVal
)
{
$this
.
val
(
selectedVal
);
if
(
selectedVal
<
repoSelectVal
||
repoSelectVal
===
prevSelectedVal
)
{
$this
.
val
(
selectedVal
).
trigger
(
'
change
'
);
highlightChanges
(
$this
);
}
$this
.
find
(
"
option[value='
"
+
selectedVal
+
"
']
"
).
nextAll
().
hid
e
();
$this
.
find
(
"
option[value='
"
+
selectedVal
+
"
']
"
).
nextAll
().
disabl
e
();
});
if
(
selectedVal
)
{
this
.
$repoSelects
.
removeClass
(
'
disabled
'
);
if
(
$lfsEnabledOption
.
length
)
{
$lfsEnabledOption
.
removeClass
(
'
disabled
'
);
highlightChanges
(
$lfsEnabledOption
);
}
if
(
containerRegistry
)
{
containerRegistry
.
style
.
display
=
''
;
}
}
else
{
this
.
$repoSelects
.
addClass
(
'
disabled
'
);
if
(
$lfsEnabledOption
.
length
)
{
$lfsEnabledOption
.
val
(
'
false
'
).
addClass
(
'
disabled
'
);
highlightChanges
(
$lfsEnabledOption
);
}
if
(
containerRegistry
)
{
containerRegistry
.
style
.
display
=
'
none
'
;
containerRegistryCheckbox
.
checked
=
false
;
}
}
prevSelectedVal
=
selectedVal
;
}.
bind
(
this
));
};
...
...
app/assets/stylesheets/framework/variables.scss
View file @
e245d7ee
...
...
@@ -187,6 +187,7 @@ $divergence-graph-bar-bg: #ccc;
$divergence-graph-separator-bg
:
#ccc
;
$general-hover-transition-duration
:
100ms
;
$general-hover-transition-curve
:
linear
;
$highlight-changes-color
:
rgb
(
235
,
255
,
232
);
/*
...
...
app/assets/stylesheets/pages/projects.scss
View file @
e245d7ee
...
...
@@ -29,6 +29,20 @@
&
>
.form-group
{
padding-left
:
0
;
}
select
option
[
disabled
]
{
display
:
none
;
}
}
select
{
background
:
transparent
;
transition
:
background
2s
ease-out
;
&
.highlight-changes
{
background
:
$highlight-changes-color
;
transition
:
none
;
}
}
.help-block
{
...
...
app/helpers/projects_helper.rb
View file @
e245d7ee
...
...
@@ -138,11 +138,15 @@ module ProjectsHelper
if
@project
.
private?
level
=
@project
.
project_feature
.
send
(
field
)
options
.
delete
(
'Everyone with access'
)
highest_available_option
=
options
.
values
.
max
if
level
==
ProjectFeature
::
ENABLED
disabled_option
=
ProjectFeature
::
ENABLED
highest_available_option
=
ProjectFeature
::
PRIVATE
if
level
==
disabled_option
end
options
=
options_for_select
(
options
,
selected:
highest_available_option
||
@project
.
project_feature
.
public_send
(
field
))
options
=
options_for_select
(
options
,
selected:
highest_available_option
||
@project
.
project_feature
.
public_send
(
field
),
disabled:
disabled_option
)
content_tag
(
:select
,
...
...
app/helpers/visibility_level_helper.rb
View file @
e245d7ee
...
...
@@ -31,9 +31,9 @@ module VisibilityLevelHelper
when
Gitlab
::
VisibilityLevel
::
PRIVATE
"Project access must be granted explicitly to each user."
when
Gitlab
::
VisibilityLevel
::
INTERNAL
"The project can be
clon
ed by any logged in user."
"The project can be
access
ed by any logged in user."
when
Gitlab
::
VisibilityLevel
::
PUBLIC
"The project can be
clon
ed without any authentication."
"The project can be
access
ed without any authentication."
end
end
...
...
app/views/projects/edit.html.haml
View file @
e245d7ee
...
...
@@ -42,7 +42,7 @@
.col-md-9
.label-light
=
label_tag
:project_visibility
,
'Project Visibility'
,
class:
'label-light'
,
for: :project_visibility_level
=
link_to
"(?)"
,
help_page_path
(
"public_access/public_access"
)
=
link_to
icon
(
'question-circle'
)
,
help_page_path
(
"public_access/public_access"
)
%span
.help-block
.col-md-3.visibility-select-container
=
render
(
'projects/visibility_select'
,
model_method: :visibility_level
,
form:
f
,
selected_level:
@project
.
visibility_level
)
...
...
@@ -92,14 +92,14 @@
.form-group
=
render
'shared/allow_request_access'
,
form:
f
-
if
Gitlab
.
config
.
lfs
.
enabled
&&
current_user
.
admin?
.row
.row
.js-lfs-enabled
.col-md-9
=
f
.
label
:lfs_enabled
,
'LFS'
,
class:
'label-light'
%span
.help-block
Git Large File Storage
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'workflow/lfs/manage_large_binaries_with_git_lfs'
)
.col-md-3
=
f
.
select
:lfs_enabled
,
[
%w(Enabled true)
,
%w(Disabled false)
],
{},
selected:
@project
.
lfs_enabled?
,
class:
'pull-right form-control'
,
data:
{
field:
'lfs_enabled'
}
=
f
.
select
:lfs_enabled
,
[
%w(Enabled true)
,
%w(Disabled false)
],
{},
selected:
@project
.
lfs_enabled?
,
class:
'pull-right form-control
project-repo-select
'
,
data:
{
field:
'lfs_enabled'
}
-
if
Gitlab
.
config
.
registry
.
enabled
...
...
changelogs/unreleased/24032-when-changing-project-visibility-setting-change-other-dropdowns-automatically.yml
0 → 100644
View file @
e245d7ee
---
title
:
Automatically adjust project settings to match changes in project visibility
merge_request
:
11831
author
:
spec/features/projects/settings/visibility_settings_spec.rb
View file @
e245d7ee
...
...
@@ -14,7 +14,7 @@ feature 'Visibility settings', feature: true, js: true do
visibility_select_container
=
find
(
'.js-visibility-select'
)
expect
(
visibility_select_container
.
find
(
'.visibility-select'
).
value
).
to
eq
project
.
visibility_level
.
to_s
expect
(
visibility_select_container
).
to
have_content
'The project can be
clon
ed without any authentication.'
expect
(
visibility_select_container
).
to
have_content
'The project can be
access
ed without any authentication.'
end
scenario
'project visibility description updates on change'
do
...
...
@@ -41,7 +41,7 @@ feature 'Visibility settings', feature: true, js: true do
expect
(
visibility_select_container
).
not_to
have_select
'.visibility-select'
expect
(
visibility_select_container
).
to
have_content
'Public'
expect
(
visibility_select_container
).
to
have_content
'The project can be
clon
ed without any authentication.'
expect
(
visibility_select_container
).
to
have_content
'The project can be
access
ed without any authentication.'
end
end
end
spec/helpers/projects_helper_spec.rb
View file @
e245d7ee
...
...
@@ -257,7 +257,7 @@ describe ProjectsHelper do
result
=
helper
.
project_feature_access_select
(
:issues_access_level
)
expect
(
result
).
to
include
(
"Disabled"
)
expect
(
result
).
to
include
(
"Only team members"
)
expect
(
result
).
not_to
include
(
"Everyone with access"
)
expect
(
result
).
to
have_selector
(
'option[disabled]'
,
text:
"Everyone with access"
)
end
end
...
...
@@ -272,7 +272,7 @@ describe ProjectsHelper do
expect
(
result
).
to
include
(
"Disabled"
)
expect
(
result
).
to
include
(
"Only team members"
)
expect
(
result
).
not_to
include
(
"Everyone with access"
)
expect
(
result
).
to
have_selector
(
'option[disabled]'
,
text:
"Everyone with access"
)
expect
(
result
).
to
have_selector
(
'option[selected]'
,
text:
"Only team members"
)
end
end
...
...
spec/helpers/visibility_level_helper_spec.rb
View file @
e245d7ee
...
...
@@ -37,7 +37,7 @@ describe VisibilityLevelHelper do
it
"describes public projects"
do
expect
(
project_visibility_level_description
(
Gitlab
::
VisibilityLevel
::
PUBLIC
))
.
to
eq
"The project can be
clon
ed without any authentication."
.
to
eq
"The project can be
access
ed without any authentication."
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