Commit 86d9ed9a0a9d58c09b89da08dd4216b89a2025a2
1 parent
38a9fc4f
Exists in
master
and in
4 other branches
Fix user add to group from admin area
Showing
2 changed files
with
1 additions
and
8 deletions
Show diff stats
app/controllers/admin/groups_controller.rb
| @@ -58,13 +58,6 @@ class Admin::GroupsController < Admin::ApplicationController | @@ -58,13 +58,6 @@ class Admin::GroupsController < Admin::ApplicationController | ||
| 58 | redirect_to :back, notice: 'Group was successfully updated.' | 58 | redirect_to :back, notice: 'Group was successfully updated.' |
| 59 | end | 59 | end |
| 60 | 60 | ||
| 61 | - def remove_project | ||
| 62 | - @project = Project.find(params[:project_id]) | ||
| 63 | - @project.transfer(nil) | ||
| 64 | - | ||
| 65 | - redirect_to :back, notice: 'Group was successfully updated.' | ||
| 66 | - end | ||
| 67 | - | ||
| 68 | def project_teams_update | 61 | def project_teams_update |
| 69 | @group.add_users(params[:user_ids].split(','), params[:group_access]) | 62 | @group.add_users(params[:user_ids].split(','), params[:group_access]) |
| 70 | 63 |
app/views/admin/groups/show.html.haml
| @@ -75,7 +75,7 @@ | @@ -75,7 +75,7 @@ | ||
| 75 | %div | 75 | %div |
| 76 | = users_select_tag(:user_ids, multiple: true) | 76 | = users_select_tag(:user_ids, multiple: true) |
| 77 | %div.prepend-top-10 | 77 | %div.prepend-top-10 |
| 78 | - = select_tag :project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span2"} | 78 | + = select_tag :group_access, options_for_select(UsersGroup.group_access_roles), class: "project-access-select chosen" |
| 79 | %hr | 79 | %hr |
| 80 | = submit_tag 'Add users into group', class: "btn btn-create" | 80 | = submit_tag 'Add users into group', class: "btn btn-create" |
| 81 | .ui-box | 81 | .ui-box |