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
675b8c9d
Commit
675b8c9d
authored
Aug 14, 2014
by
Jan-Willem van der Meer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Uniform interface to add multiple LDAP connections
parent
68ada955
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
20 deletions
+26
-20
app/views/admin/groups/_form.html.haml
app/views/admin/groups/_form.html.haml
+2
-1
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+1
-1
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+1
-1
app/views/ldap_group_links/_form.html.haml
app/views/ldap_group_links/_form.html.haml
+5
-17
app/views/ldap_group_links/_ldap_group_link.html.haml
app/views/ldap_group_links/_ldap_group_link.html.haml
+6
-0
app/views/ldap_group_links/_ldap_group_links.html.haml
app/views/ldap_group_links/_ldap_group_links.html.haml
+11
-0
No files found.
app/views/admin/groups/_form.html.haml
View file @
675b8c9d
...
...
@@ -57,4 +57,5 @@
=
link_to
'Cancel'
,
admin_group_path
(
@group
),
class:
"btn btn-cancel"
-
if
@group
.
persisted?
=
render
'groups/ldap_group_links/form'
,
group:
@group
%h3
.page-title
LDAP Synchronizations
=
render
'ldap_group_links/form'
,
group:
@group
app/views/admin/groups/show.html.haml
View file @
675b8c9d
...
...
@@ -33,7 +33,7 @@
.panel.panel-default
.panel-heading
LDAP
Connec
tions
LDAP
Synchroniza
tions
%ul
.well-list
-
if
@group
.
ldap_group_links
.
any?
-
@group
.
ldap_group_links
.
each
do
|
ldap_group_link
|
...
...
app/views/groups/edit.html.haml
View file @
675b8c9d
...
...
@@ -44,7 +44,7 @@
.form-actions
=
f
.
submit
'Save group'
,
class:
"btn btn-save"
=
render
'
groups/
ldap_group_links/form'
,
group:
@group
=
render
'ldap_group_links/form'
,
group:
@group
.panel.panel-danger
.panel-heading
Remove group
.panel-body
...
...
app/views/
groups/
ldap_group_links/_form.html.haml
→
app/views/ldap_group_links/_form.html.haml
View file @
675b8c9d
%section
.ldap-group-links
%fieldset
%legend
Current LDAP links
-
if
group
.
ldap_group_links
.
any?
%ul
.bordered-list
-
group
.
ldap_group_links
.
each
do
|
ldap_group_link
|
%li
%h4
=
ldap_group_link
.
cn
%small
.light
==
as
#{
ldap_group_link
.
human_access
}
.pull-right
=
link_to
group_ldap_group_link_path
(
group
,
ldap_group_link
),
method: :delete
,
class:
'btn btn-danger btn-small'
do
=
fa_icon
(
'unlink'
,
text:
'unlink'
)
-
else
%p
No links yet
=
form_for
[
group
,
group
.
ldap_group_links
.
new
]
do
|
f
|
=
form_for
[
group
,
LdapGroupLink
.
new
]
do
|
f
|
%fieldset
%legend
Add new LDAP link
%legend
%div
.form-holder
.form-group.clearfix
=
f
.
label
:ldap_cn
,
class:
'control-label'
do
...
...
@@ -38,4 +24,6 @@
You can manage permission levels for individual group members in the Members tab.
.form-actions
=
f
.
submit
'Save changes'
,
class:
"btn btn-primary"
=
f
.
submit
'Add Synchronization'
,
class:
"btn btn-create"
=
render
partial:
'ldap_group_links/ldap_group_links'
,
locals:
{
group:
group
}
\ No newline at end of file
app/views/ldap_group_links/_ldap_group_link.html.haml
0 → 100644
View file @
675b8c9d
%li
=
ldap_group_link
.
cn
%small
.light
==
as
#{
ldap_group_link
.
human_access
}
.pull-right
=
link_to
group_ldap_group_link_path
(
group
,
ldap_group_link
),
method: :delete
,
class:
'btn btn-danger btn-small'
do
=
fa_icon
(
'unlink'
,
text:
'unlink'
)
app/views/ldap_group_links/_ldap_group_links.html.haml
0 → 100644
View file @
675b8c9d
.panel.panel-default
.panel-heading
%h4
.panel-title
LDAP Synchronizations
==
(
#{
group
.
ldap_group_links
.
count
}
)
-
if
group
.
ldap_group_links
.
any?
%ul
.well-list
=
render
collection:
group
.
ldap_group_links
,
partial:
'ldap_group_links/ldap_group_link'
,
locals:
{
group:
group
}
-
else
%p
No synchronizations yet
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