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
eb95169f
Commit
eb95169f
authored
Sep 25, 2017
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix ldap group link and add some debug info
parent
606cf5d6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
8 deletions
+7
-8
app/views/admin/groups/_form.html.haml
app/views/admin/groups/_form.html.haml
+1
-1
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+2
-3
app/views/groups/ldap_group_links/index.html.haml
app/views/groups/ldap_group_links/index.html.haml
+1
-1
app/views/ldap_group_links/_ldap_group_link.html.haml
app/views/ldap_group_links/_ldap_group_link.html.haml
+1
-1
app/views/ldap_group_links/_ldap_group_links.html.haml
app/views/ldap_group_links/_ldap_group_links.html.haml
+2
-2
No files found.
app/views/admin/groups/_form.html.haml
View file @
eb95169f
...
@@ -37,6 +37,6 @@
...
@@ -37,6 +37,6 @@
=
link_to
'Cancel'
,
admin_group_path
(
@group
),
class:
"btn btn-cancel"
=
link_to
'Cancel'
,
admin_group_path
(
@group
),
class:
"btn btn-cancel"
-
if
ldap_enabled?
&&
@group
.
persisted?
-
if
ldap_enabled?
&&
@group
.
persisted?
%h3
.page-title
L
inked LDAP group
s
%h3
.page-title
L
DAP synchronization
s
=
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/admin/groups/show.html.haml
View file @
eb95169f
...
@@ -63,13 +63,12 @@
...
@@ -63,13 +63,12 @@
=
render
partial:
"namespaces/shared_runner_status"
,
locals:
{
namespace:
@group
}
=
render
partial:
"namespaces/shared_runner_status"
,
locals:
{
namespace:
@group
}
.panel.panel-default
.panel.panel-default
.panel-heading
Linked LDAP group
s
.panel-heading
Active synchronization
s
%ul
.well-list
%ul
.well-list
-
if
@group
.
ldap_group_links
.
any?
-
if
@group
.
ldap_group_links
.
any?
-
@group
.
ldap_group_links
.
each
do
|
ldap_group_link
|
-
@group
.
ldap_group_links
.
each
do
|
ldap_group_link
|
%li
%li
cn:
%strong
=
ldap_group_link
.
cn
?
"Group:
#{
ldap_group_link
.
cn
}
"
:
"Filter:
#{
truncate
(
ldap_group_link
.
filter
,
length:
70
)
}
"
%strong
=
ldap_group_link
.
cn
as
as
%strong
=
ldap_group_link
.
human_access
%strong
=
ldap_group_link
.
human_access
...
...
app/views/groups/ldap_group_links/index.html.haml
View file @
eb95169f
-
page_title
'LDAP Syncrhonizations'
-
page_title
'LDAP Syncrhonizations'
%h3
.page-title
L
inked LDAP group
s
%h3
.page-title
L
DAP synchronization
s
=
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/_ldap_group_link.html.haml
View file @
eb95169f
%li
%li
.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:
'
Remove
'
)
%strong
=
ldap_group_link
.
cn
?
"Group:
#{
ldap_group_link
.
cn
}
"
:
"Filter:
#{
truncate
(
ldap_group_link
.
filter
,
length:
70
)
}
"
%strong
=
ldap_group_link
.
cn
?
"Group:
#{
ldap_group_link
.
cn
}
"
:
"Filter:
#{
truncate
(
ldap_group_link
.
filter
,
length:
70
)
}
"
-
if
ldap_group_link
.
config
-
if
ldap_group_link
.
config
...
...
app/views/ldap_group_links/_ldap_group_links.html.haml
View file @
eb95169f
.panel.panel-default
.panel.panel-default
.panel-heading
.panel-heading
%h4
.panel-title
%h4
.panel-title
Linked LDAP group
s (
#{
group
.
ldap_group_links
.
count
}
)
Active synchronization
s (
#{
group
.
ldap_group_links
.
count
}
)
-
if
group
.
ldap_group_links
.
any?
-
if
group
.
ldap_group_links
.
any?
%ul
.well-list
%ul
.well-list
=
render
collection:
group
.
ldap_group_links
,
partial:
'ldap_group_links/ldap_group_link'
,
locals:
{
group:
group
}
=
render
collection:
group
.
ldap_group_links
,
partial:
'ldap_group_links/ldap_group_link'
,
locals:
{
group:
group
}
-
else
-
else
.panel-body
.panel-body
No
linked LDAP group
s
No
LDAP synchronization
s
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