Download as
Browse Code »

Commit d8398921eb34fe7cee59df99ac4fffceca0c19fc

Authored by Dmitriy Zaporozhets
1 parent ba74fa14
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Dont allow select block user as new team member

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/controllers/admin/projects_controller.rb
  Diff comments   View file @d839892
... ... @@ -10,7 +10,7 @@ class Admin::ProjectsController < AdminController
10 10 end
11 11  
12 12 def show
13   - @users = User.scoped
  13 + @users = User.active
14 14 @users = @users.not_in_project(@project) if @project.users.present?
15 15 @users = @users.all
16 16 end
... ...
app/views/team_members/_form.html.haml
  Diff comments   View file @d839892
... ... @@ -11,7 +11,7 @@
11 11 %h6 1. Choose people you want in the team
12 12 .clearfix
13 13 = f.label :user_ids, "People"
14   - .input= select_tag(:user_ids, options_from_collection_for_select(User.not_in_project(@project).all, :id, :name), {data: {placeholder: "Select users"}, class: "chosen xxlarge", multiple: true})
  14 + .input= select_tag(:user_ids, options_from_collection_for_select(User.active.not_in_project(@project).all, :id, :name), {data: {placeholder: "Select users"}, class: "chosen xxlarge", multiple: true})
15 15  
16 16 %h6 2. Set access level for them
17 17 .clearfix
... ...