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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
86d9ed9a
Commit
86d9ed9a
authored
Jun 20, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix user add to group from admin area
parent
38a9fc4f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
8 deletions
+1
-8
app/controllers/admin/groups_controller.rb
app/controllers/admin/groups_controller.rb
+0
-7
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+1
-1
No files found.
app/controllers/admin/groups_controller.rb
View file @
86d9ed9a
...
@@ -58,13 +58,6 @@ class Admin::GroupsController < Admin::ApplicationController
...
@@ -58,13 +58,6 @@ class Admin::GroupsController < Admin::ApplicationController
redirect_to
:back
,
notice:
'Group was successfully updated.'
redirect_to
:back
,
notice:
'Group was successfully updated.'
end
end
def
remove_project
@project
=
Project
.
find
(
params
[
:project_id
])
@project
.
transfer
(
nil
)
redirect_to
:back
,
notice:
'Group was successfully updated.'
end
def
project_teams_update
def
project_teams_update
@group
.
add_users
(
params
[
:user_ids
].
split
(
','
),
params
[
:group_access
])
@group
.
add_users
(
params
[
:user_ids
].
split
(
','
),
params
[
:group_access
])
...
...
app/views/admin/groups/show.html.haml
View file @
86d9ed9a
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
%div
%div
=
users_select_tag
(
:user_ids
,
multiple:
true
)
=
users_select_tag
(
:user_ids
,
multiple:
true
)
%div
.prepend-top-10
%div
.prepend-top-10
=
select_tag
:
project_access
,
options_for_select
(
Project
.
access_options
),
{
class:
"project-access-select chosen span2"
}
=
select_tag
:
group_access
,
options_for_select
(
UsersGroup
.
group_access_roles
),
class:
"project-access-select chosen"
%hr
%hr
=
submit_tag
'Add users into group'
,
class:
"btn btn-create"
=
submit_tag
'Add users into group'
,
class:
"btn btn-create"
.ui-box
.ui-box
...
...
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