only active users are now proposed when adding a member to a project

git-svn-id: http://redmine.rubyforge.org/svn/trunk@190 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 403f4a5ffb3b42070a339a537a2e51e36785c76f..41b9e5b34c6189215f17ffec7d71bc716f66d3b0 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -92,7 +92,7 @@ class ProjectsController < ApplicationController
     @issue_category ||= IssueCategory.new\r
     @member ||= @project.members.new\r
     @roles = Role.find(:all)\r
-    @users = User.find(:all) - @project.members.find(:all, :include => :user).collect{|m| m.user }\r
+    @users = User.find_active(:all) - @project.users\r
     @custom_values ||= ProjectCustomField.find(:all).collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }\r
   end\r
   \r

diff --git a/app/models/user.rb b/app/models/user.rb
index 8a596168e2267500e69d0bc86ceb15234c49a55f..bf2930a0f76b274ea7e76350b155e937a6d35298 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -49,7 +49,19 @@ class User < ActiveRecord::Base
     # update hashed_password if password was set\r
     self.hashed_password = User.hash_password(self.password) if self.password\r
   end\r
-       \r
+\r
+  def self.active\r
+    with_scope :find => { :conditions => [ "status = ?", STATUS_ACTIVE ] } do \r
+      yield \r
+    end \r
+  end\r
+  \r
+  def self.find_active(*args)\r
+    active do\r
+      find(*args)\r
+    end\r
+  end\r
+  \r
   # Returns the user that matches provided login and password, or nil\r
   def self.try_to_login(login, password)\r
     user = find(:first, :conditions => ["login=?", login])\r