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
9ac7dcb8
Commit
9ac7dcb8
authored
Mar 16, 2018
by
Michael Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable controls when overridden
parent
2d3c3ab1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
2 deletions
+14
-2
app/views/shared/members/_member.html.haml
app/views/shared/members/_member.html.haml
+2
-2
ee/changelogs/unreleased/mk-fix-ldap-group-sync-permission-override.yml
...unreleased/mk-fix-ldap-group-sync-permission-override.yml
+5
-0
ee/spec/features/groups/members/override_ldap_memberships_spec.rb
...features/groups/members/override_ldap_memberships_spec.rb
+7
-0
No files found.
app/views/shared/members/_member.html.haml
View file @
9ac7dcb8
...
...
@@ -62,7 +62,7 @@
=
f
.
hidden_field
:access_level
.member-form-control.dropdown.append-right-5
%button
.dropdown-menu-toggle.js-member-permissions-dropdown
{
type:
"button"
,
disabled:
member
.
can_override?
,
disabled:
member
.
can_override?
&&
!
member
.
override?
,
data:
{
toggle:
"dropdown"
,
field_name:
"#{f.object_name}[access_level]"
}
}
%span
.dropdown-toggle-text
=
member
.
human_access
...
...
@@ -82,7 +82,7 @@
can_override:
member
.
can_override?
.prepend-left-5.clearable-input.member-form-control
=
f
.
text_field
:expires_at
,
disabled:
member
.
can_override?
,
disabled:
member
.
can_override?
&&
!
member
.
override?
,
class:
'form-control js-access-expiration-date js-member-update-control'
,
placeholder:
'Expiration date'
,
id:
"member_expires_at_
#{
member
.
id
}
"
,
...
...
ee/changelogs/unreleased/mk-fix-ldap-group-sync-permission-override.yml
0 → 100644
View file @
9ac7dcb8
---
title
:
Fix LDAP group sync permission override UI
merge_request
:
5003
author
:
type
:
fixed
ee/spec/features/groups/members/override_ldap_memberships_spec.rb
View file @
9ac7dcb8
...
...
@@ -58,6 +58,13 @@ feature 'Groups > Members > Master/Owner can override LDAP access levels' do
expect
(
page
).
not_to
have_content
ldap_override_message
expect
(
page
).
not_to
have_button
'Change permissions'
within
"#group_member_
#{
ldap_member
.
id
}
"
do
expect
(
page
).
not_to
have_button
'Edit permissions'
expect
(
page
).
to
have_button
'Guest'
,
disabled:
false
end
refresh
# controls should still be enabled after a refresh
within
"#group_member_
#{
ldap_member
.
id
}
"
do
expect
(
page
).
not_to
have_button
'Edit permissions'
expect
(
page
).
to
have_button
'Guest'
,
disabled:
false
...
...
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