diff options
| author | jessib <jessib@riseup.net> | 2012-10-31 12:56:18 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2012-10-31 12:56:18 -0700 |
| commit | 73a4e9f06840a85225d93734c1f4fb2ebb3b5a93 (patch) | |
| tree | d754b695fed020a0a24c61f160abf04b8049a882 /users/app/models/user.rb | |
| parent | 6eaecdd10be3974871583e1fed8c5d4e7e307bd8 (diff) | |
| parent | fc625a54eb5c54cecb5331811ff482df12b7c059 (diff) | |
Merge branch 'develop' into help_develop
Diffstat (limited to 'users/app/models/user.rb')
| -rw-r--r-- | users/app/models/user.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/users/app/models/user.rb b/users/app/models/user.rb index 29c0b38..a06893f 100644 --- a/users/app/models/user.rb +++ b/users/app/models/user.rb @@ -44,7 +44,10 @@ class User < CouchRest::Model::Base end def to_json(options={}) - super(options.merge(:only => ['login', 'password_salt'])) + { + :login => login, + :ok => valid? + }.to_json(options) end def initialize_auth(aa) |