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
5b0a041e
Commit
5b0a041e
authored
Oct 27, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update URL to work with project member
parent
e39cc88f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
app/views/shared/members/_member.html.haml
app/views/shared/members/_member.html.haml
+3
-2
No files found.
app/views/shared/members/_member.html.haml
View file @
5b0a041e
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
-
user
=
local_assigns
.
fetch
(
:user
,
member
.
user
)
-
user
=
local_assigns
.
fetch
(
:user
,
member
.
user
)
-
source
=
member
.
source
-
source
=
member
.
source
-
can_admin_member
=
can?
(
current_user
,
action_member_permission
(
:update
,
member
),
member
)
-
can_admin_member
=
can?
(
current_user
,
action_member_permission
(
:update
,
member
),
member
)
-
update_url
=
member
.
type
==
'GroupMember'
?
group_group_member_path
(
@group
,
member
)
:
namespace_project_project_member_path
(
@project
.
namespace
,
@project
,
member
)
%li
.member
{
class:
[
dom_class
(
member
),
(
"is-overriden"
if
member
.
override
)],
id:
dom_id
(
member
)
}
%li
.member
{
class:
[
dom_class
(
member
),
(
"is-overriden"
if
member
.
override
)],
id:
dom_id
(
member
)
}
%span
.list-item-name
%span
.list-item-name
...
@@ -78,7 +79,7 @@
...
@@ -78,7 +79,7 @@
%li
.divider
%li
.divider
%li
%li
%a
{
href:
"javascript:void(0)"
,
%a
{
href:
"javascript:void(0)"
,
data:
{
revert:
"true"
,
endpoint:
group_group_member_path
(
@group
,
member
)
,
id:
dom_id
(
member
)
}
}
data:
{
revert:
"true"
,
endpoint:
update_url
,
id:
dom_id
(
member
)
}
}
Revert to LDAP group sync settings
Revert to LDAP group sync settings
.prepend-left-5.clearable-input.member-form-control
.prepend-left-5.clearable-input.member-form-control
=
f
.
text_field
:expires_at
,
class:
'form-control js-access-expiration-date js-member-update-control'
,
placeholder:
'Expiration date'
,
id:
"member_expires_at_
#{
member
.
id
}
"
,
disabled:
!
can_admin_member
=
f
.
text_field
:expires_at
,
class:
'form-control js-access-expiration-date js-member-update-control'
,
placeholder:
'Expiration date'
,
id:
"member_expires_at_
#{
member
.
id
}
"
,
disabled:
!
can_admin_member
...
@@ -128,7 +129,7 @@
...
@@ -128,7 +129,7 @@
.controls
.controls
%button
.btn.btn-warning.js-ldap-override
{
type:
"button"
,
%button
.btn.btn-warning.js-ldap-override
{
type:
"button"
,
"aria-label"
=>
"Change LDAP member permissions"
,
"aria-label"
=>
"Change LDAP member permissions"
,
data:
{
id:
dom_id
(
member
),
endpoint:
group_group_member_path
(
@group
,
member
)
}
}
data:
{
id:
dom_id
(
member
),
endpoint:
update_url
}
}
Change permissions
Change permissions
%button
.btn.btn-default.js-ldap-permissions
{
type:
"button"
,
%button
.btn.btn-default.js-ldap-permissions
{
type:
"button"
,
"aria-label"
=>
"Close permissions override"
,
"aria-label"
=>
"Close permissions override"
,
...
...
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