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
734ca1eb
Commit
734ca1eb
authored
Sep 24, 2017
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update views
parent
9ac49271
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
5 deletions
+32
-5
app/views/groups/ldap_group_links/index.html.haml
app/views/groups/ldap_group_links/index.html.haml
+1
-2
app/views/ldap_group_links/_form.html.haml
app/views/ldap_group_links/_form.html.haml
+30
-2
app/views/ldap_group_links/_ldap_group_link.html.haml
app/views/ldap_group_links/_ldap_group_link.html.haml
+1
-1
No files found.
app/views/groups/ldap_group_links/index.html.haml
View file @
734ca1eb
-
page_title
"LDAP Groups"
-
page_title
'LDAP Syncrhonizations'
%h3
.page-title
Linked LDAP groups
%h3
.page-title
Linked LDAP groups
=
render
'ldap_group_links/form'
,
group:
@group
=
render
'ldap_group_links/form'
,
group:
@group
=
render
'ldap_group_links/ldap_group_links'
,
group:
@group
=
render
'ldap_group_links/ldap_group_links'
,
group:
@group
app/views/ldap_group_links/_form.html.haml
View file @
734ca1eb
...
@@ -6,16 +6,44 @@
...
@@ -6,16 +6,44 @@
LDAP Server
LDAP Server
.col-sm-10
.col-sm-10
=
f
.
select
:provider
,
ldap_server_select_options
,
{},
class:
'form-control'
=
f
.
select
:provider
,
ldap_server_select_options
,
{},
class:
'form-control'
.form-group.clearfix
.form-group.clearfix
=
f
.
label
:cn
,
class:
'control-label'
do
Sync method
.col-sm-2
.col-sm-10
.radio
=
label_tag
:ldap_group
do
=
radio_button_tag
:sync_method
,
:group
,
true
.option-title
LDAP Group cn
.radio
=
label_tag
:ldap_filter
do
=
radio_button_tag
:sync_method
,
:filter
.option-title
LDAP user filter
.form-group.clearfix.cn-link
=
f
.
label
:cn
,
class:
'control-label'
do
=
f
.
label
:cn
,
class:
'control-label'
do
LDAP Group cn
LDAP Group cn
.col-sm-10
.col-sm-10
=
f
.
hidden_field
:cn
,
placeholder:
"Ex. QA group"
,
class:
"xxlarge ajax-ldap-groups-select input-mn-300"
=
f
.
hidden_field
:cn
,
placeholder:
'Ex. QA group'
,
class:
'xxlarge ajax-ldap-groups-select input-mn-300'
.help-block
.help-block
Synchronize
#{
group
.
name
}
's members with this LDAP group.
Synchronize
#{
group
.
name
}
's members with this LDAP group.
%br
%br
If you select an LDAP group you do not belong to you will lose ownership of
#{
group
.
name
}
.
If you select an LDAP group you do not belong to you will lose ownership of
#{
group
.
name
}
.
.form-group.clearfix.filter-link
=
f
.
label
:filter
,
class:
'control-label'
do
LDAP User filter
.col-sm-10
=
f
.
text_field
:filter
,
placeholder:
'Ex. (&(objectCategory=person)(objectClass=developer))'
,
class:
'form-control xxlarge input-mn-300'
.help-block
-
ldap_link
=
link_to
'LDAP Search Filter Syntax'
,
'https://msdn.microsoft.com/en-us/library/aa746475(v=vs.85).aspx'
This query must use valid
#{
ldap_link
}
. Synchronize
#{
group
.
name
}
's members with this LDAP user filter.
%br
If you do not belong to this LDAP user filter you will lose ownership of
#{
group
.
name
}
.
.form-group.clearfix
.form-group.clearfix
=
f
.
label
:group_access
,
class:
'control-label'
do
=
f
.
label
:group_access
,
class:
'control-label'
do
LDAP Access
LDAP Access
...
@@ -27,4 +55,4 @@
...
@@ -27,4 +55,4 @@
You can manage permission levels for individual group members in the Members tab.
You can manage permission levels for individual group members in the Members tab.
.form-actions
.form-actions
=
f
.
submit
'Add synchronization'
,
class:
"btn btn-create"
=
f
.
submit
'Add synchronization'
,
class:
'btn btn-create'
app/views/ldap_group_links/_ldap_group_link.html.haml
View file @
734ca1eb
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
.pull-right
.pull-right
=
link_to
group_ldap_group_link_path
(
group
,
ldap_group_link
),
method: :delete
,
class:
'btn btn-danger btn-sm'
do
=
link_to
group_ldap_group_link_path
(
group
,
ldap_group_link
),
method: :delete
,
class:
'btn btn-danger btn-sm'
do
=
fa_icon
(
'unlink'
,
text:
'unlink'
)
=
fa_icon
(
'unlink'
,
text:
'unlink'
)
%strong
=
ldap_group_link
.
cn
%strong
=
ldap_group_link
.
cn
?
"Group:
#{
ldap_group_link
.
cn
}
"
:
"Filter:
#{
ldap_group_link
.
filter
}
"
-
if
ldap_group_link
.
config
-
if
ldap_group_link
.
config
.light
.light
...
...
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