Add a user list view for administrators

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 23e95bc8803e3a1469ce58cefdd57a1990746069..31b0f27a03428ef9223b3c00bfe05bd89504c27f 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -56,8 +56,11 @@ class User < ActiveRecord::Base
       user = token.user if token
     end
 
-    if user
-      user = nil unless user.visible? and (user.active? or options[:inactive])
+    if user and
+      ( user.status == "deleted" or
+        ( user.status == "pending" and not options[:pending] ) or
+        ( user.status == "suspended" and not options[:suspended] ) )
+      user = nil
     end
 
     token.update_attribute(:expiry, 1.week.from_now) if token and user