Dont allow select block user as new team member

diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index f8c2f2b..4fea870 100644 (file)
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -10,7 +10,7 @@ class Admin::ProjectsController < AdminController
   end
 
   def show
-    @users = User.scoped
+    @users = User.active
     @users = @users.not_in_project(@project) if @project.users.present?
     @users = @users.all
   end

diff --git a/app/views/team_members/_form.html.haml b/app/views/team_members/_form.html.haml
index 9216713..e5d9a4a 100644 (file)
--- a/app/views/team_members/_form.html.haml
+++ b/app/views/team_members/_form.html.haml
@@ -11,7 +11,7 @@
   %h6 1. Choose people you want in the team
   .clearfix
     = f.label :user_ids, "People"
-    .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})
+    .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})
 
   %h6 2. Set access level for them
   .clearfix