diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-17 16:51:43 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-18 17:47:52 +0300 |
| commit | e12c9ee2bc76026b146ea1b29fd0acc5ac696d34 (patch) | |
| tree | 29f1d649c13f16cfdf80fc3b3f19cedc17a0deda /app/controllers/groups_controller.rb | |
| parent | c9fb7e39eb601d1b959ea89363bb877f7679b2bc (diff) | |
| download | gitlab-ce-e12c9ee2bc76026b146ea1b29fd0acc5ac696d34.tar.gz | |
Added UsersGroup scaffold. Simplify adding people to group
Diffstat (limited to 'app/controllers/groups_controller.rb')
| -rw-r--r-- | app/controllers/groups_controller.rb | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index a191aff2b6b..617cfddd21a 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -1,6 +1,6 @@ class GroupsController < ApplicationController respond_to :html - before_filter :group, except: [:new, :create] + before_filter :group, except: [:new, :create, :people] # Authorize before_filter :authorize_read_group!, except: [:new, :create] @@ -63,20 +63,8 @@ class GroupsController < ApplicationController def people @project = group.projects.find(params[:project_id]) if params[:project_id] - - if @project - @members = @project.users_projects - @team_member = @project.users_projects.new - else - @members = group.users_groups - @team_member = UsersGroup.new - end - end - - def team_members - @group.add_users(params[:user_ids].split(','), params[:group_access]) - - redirect_to people_group_path(@group), notice: 'Users were successfully added.' + @members = group.users_groups + @users_group = UsersGroup.new end def edit |