summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-03-28 15:56:21 -0700
committerelijah <elijah@riseup.net>2016-03-28 16:03:54 -0700
commit9a8577a2d19aa51318dce6ff9ffe1bd26f25c09e (patch)
tree924fe73125e20c26778dca035c0efb28842c40e3 /app/models
parente072ac2fa8bc93ed782df1ff95130f4794f9640f (diff)
api: added get(:show) to identities and users, allow monitors to create/delete test & tmp users.
Diffstat (limited to 'app/models')
-rw-r--r--app/models/user.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 1c54f0c..51e9279 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -68,8 +68,10 @@ class User < CouchRest::Model::Base
def to_json(options={})
{
- :login => login,
- :ok => valid?
+ :login => self.login,
+ :ok => self.valid?,
+ :id => self.id,
+ :enabled => self.enabled?
}.to_json(options)
end