Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api

2014-12-18 14:51:37 +08:00 · 2014-12-18 14:51:37 +08:00 · 93c7deebc4
parent 53d85136a3 03f2c9c192
commit 93c7deebc4
2 changed files with 1343 additions and 1330 deletions
--- a/app/api/mobile/apis/watches.rb
+++ b/app/api/mobile/apis/watches.rb
@ -25,8 +25,9 @@ module Mobile
        post do
          authenticate!
          ws = WatchesService.new
-            o = ws.watch(params.merge({current_user_id:current_user.id, object_type:'user' }) )
-            {status:0, data: o}
+          o = ws.watch(params.merge({current_user_id:current_user.id, object_type:'user' }) )
+          present :data, o, with: Mobile::Entities::User
+          present :status, 0
        end


--- a/db/schema.rb
+++ b/db/schema.rb