diff options
| author | jessib <jessib@riseup.net> | 2012-10-31 10:43:33 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2012-10-31 10:43:33 -0700 |
| commit | fc625a54eb5c54cecb5331811ff482df12b7c059 (patch) | |
| tree | 6ffae8ccde3662360416fc2ce6e15ccfc2cf29a4 /users/app/models | |
| parent | 2de76b40a926985fce186c8ba18450d310ed4fa3 (diff) | |
| parent | 4b7333eec8eaf0c01227ade9d77a21f7a879ff0b (diff) | |
Merge branch 'develop' of ssh://leap.se/leap_web into develop
Diffstat (limited to 'users/app/models')
| -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) |