kylefang/deployd
1
0
Fork 0
mirror of https://github.com/zhigang1992/deployd.git synced 2026-05-23 04:47:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.5' of https://github.com/ritch/deployd into 0.5

Browse Source
This commit is contained in:
DallonF
2012-06-11 09:44:53 -07:00
parent 832e0966d7 f28877bebf
commit 1ca5bf3491
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
TODO.md
View File

@@ -15,8 +15,7 @@
- [x] files resource
- [x] config
- [x] dashboard / dev integration
- eg. microscripts
- auto generated dpd.js
- [x] auto generated dpd.js
- server and client version
- integration tests ported from 0.4
- add key check back to dashboard

8
lib/resources/user-collection.js
View File

@@ -80,10 +80,10 @@ UserCollection.prototype.handle = function (ctx) {
return ctx.done(new Error('Not logged in'));
}
return this.find(ctx.session, {id: ctx.session.data.uid}, ctx.done);
return this.find(ctx.session, {id: ctx.session.data.uid}, ctx.dpd, ctx.done);
}
this.find(ctx.session, ctx.query, ctx.done);
this.find(ctx.session, ctx.query, ctx.dpd, ctx.done);
break;
case 'POST':
if(ctx.url === '/login') {
@@ -121,11 +121,11 @@ UserCollection.prototype.handle = function (ctx) {
}
if(ctx.query.id) {
this.save(ctx.session, ctx.body, ctx.query, done);
this.save(ctx.session, ctx.body, ctx.query, ctx.dpd, done);
} else {
this.store.first({email: ctx.body.email}, function (err, u) {
if(u) return ctx.done({errors: {email: 'is already in use'}});
uc.save(ctx.session, ctx.body, ctx.query, done);
uc.save(ctx.session, ctx.body, ctx.query, ctx.dpd, done);
})
}
break;