Merge remote-tracking branch 'origin/develop'

We'll only use the master branch for development from now on.

1 files changed, 10 insertions, 4 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index cb093cf..9cebbca 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,8 +1,10 @@
+require 'login_format_validation'
+require 'local_email'
+require 'temporary_user'
+
 class User < CouchRest::Model::Base
   include LoginFormatValidation
 
-  use_database :users
-
   property :login, String, :accessible => true
   property :password_verifier, String, :accessible => true
   property :password_salt, String, :accessible => true
@@ -71,12 +73,16 @@ class User < CouchRest::Model::Base
   end
 
   def to_json(options={})
+    to_hash.to_json(options)
+  end
+
+  def to_hash()
     {
       :login => self.login,
       :ok => self.valid?,
       :id => self.id,
-      :enabled => self.enabled?
-    }.to_json(options)
+      :enabled => self.enabled?,
+    }
   end
 
   def salt