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
e5199638
Commit
e5199638
authored
Aug 14, 2014
by
Jan-Willem van der Meer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor group/edit LDAP sync page
parent
675b8c9d
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
4 deletions
+17
-4
app/controllers/groups/ldap_group_links_controller.rb
app/controllers/groups/ldap_group_links_controller.rb
+3
-0
app/views/admin/groups/_form.html.haml
app/views/admin/groups/_form.html.haml
+1
-0
app/views/groups/_settings_nav.html.haml
app/views/groups/_settings_nav.html.haml
+4
-0
app/views/groups/ldap_group_links/index.html.haml
app/views/groups/ldap_group_links/index.html.haml
+7
-0
app/views/ldap_group_links/_form.html.haml
app/views/ldap_group_links/_form.html.haml
+1
-3
config/routes.rb
config/routes.rb
+1
-1
No files found.
app/controllers/groups/ldap_group_links_controller.rb
View file @
e5199638
...
@@ -2,6 +2,9 @@ class Groups::LdapGroupLinksController < ApplicationController
...
@@ -2,6 +2,9 @@ class Groups::LdapGroupLinksController < ApplicationController
before_action
:group
before_action
:group
before_action
:authorize_admin_group!
before_action
:authorize_admin_group!
def
index
end
def
create
def
create
ldap_group_link
=
@group
.
ldap_group_links
.
build
(
ldap_group_link_params
)
ldap_group_link
=
@group
.
ldap_group_links
.
build
(
ldap_group_link_params
)
if
ldap_group_link
.
save
if
ldap_group_link
.
save
...
...
app/views/admin/groups/_form.html.haml
View file @
e5199638
...
@@ -59,3 +59,4 @@
...
@@ -59,3 +59,4 @@
-
if
@group
.
persisted?
-
if
@group
.
persisted?
%h3
.page-title
LDAP Synchronizations
%h3
.page-title
LDAP Synchronizations
=
render
'ldap_group_links/form'
,
group:
@group
=
render
'ldap_group_links/form'
,
group:
@group
=
render
'ldap_group_links/ldap_group_links'
,
group:
@group
app/views/groups/_settings_nav.html.haml
View file @
e5199638
...
@@ -7,4 +7,8 @@
...
@@ -7,4 +7,8 @@
=
link_to
projects_group_path
(
@group
)
do
=
link_to
projects_group_path
(
@group
)
do
%i
.icon-folder-close
%i
.icon-folder-close
Projects
Projects
=
nav_link
(
controller:
[
:groups
,
:ldap_group_links
])
do
=
link_to
group_ldap_group_links_path
(
@group
)
do
%i
.icon-exchange
LDAP Sync
app/views/groups/ldap_group_links/index.html.haml
0 → 100644
View file @
e5199638
.row
.col-md-2
=
render
'groups/settings_nav'
.col-md-10
%h3
.page-title
LDAP Synchronizations
=
render
'ldap_group_links/form'
,
group:
@group
=
render
'ldap_group_links/ldap_group_links'
,
group:
@group
app/views/ldap_group_links/_form.html.haml
View file @
e5199638
...
@@ -24,6 +24,4 @@
...
@@ -24,6 +24,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"
\ No newline at end of file
=
render
partial:
'ldap_group_links/ldap_group_links'
,
locals:
{
group:
group
}
\ No newline at end of file
config/routes.rb
View file @
e5199638
...
@@ -167,7 +167,7 @@ Gitlab::Application.routes.draw do
...
@@ -167,7 +167,7 @@ Gitlab::Application.routes.draw do
resources
:users_groups
,
only:
[
:create
,
:update
,
:destroy
]
resources
:users_groups
,
only:
[
:create
,
:update
,
:destroy
]
scope
module: :groups
do
scope
module: :groups
do
resources
:ldap_group_links
,
only:
[
:create
,
:destroy
]
resources
:ldap_group_links
,
only:
[
:
index
,
:
create
,
:destroy
]
resource
:avatar
,
only:
[
:destroy
]
resource
:avatar
,
only:
[
:destroy
]
resources
:milestones
resources
:milestones
end
end
...
...
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