From 86d9ed9a0a9d58c09b89da08dd4216b89a2025a2 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 20 Jun 2013 12:06:44 +0300 Subject: [PATCH] Fix user add to group from admin area --- app/controllers/admin/groups_controller.rb | 7 ------- app/views/admin/groups/show.html.haml | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 6e6c8d54e29..44ec6079e5b 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -58,13 +58,6 @@ class Admin::GroupsController < Admin::ApplicationController redirect_to :back, notice: 'Group was successfully updated.' 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 @group.add_users(params[:user_ids].split(','), params[:group_access]) diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 3de0091801f..bec9b0c650b 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -75,7 +75,7 @@ %div = users_select_tag(:user_ids, multiple: true) %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 = submit_tag 'Add users into group', class: "btn btn-create" .ui-box -- GitLab