krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added fields for more approver details

Browse Source
This commit is contained in:
Keith Holliday
2016-10-08 06:35:53 -05:00
parent f2e5bc52e5
commit 2173f53883
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/api/v3/integration/tasks/groups/POST-group_tasks_id_approve_userId.test.js
View File

@@ -59,5 +59,7 @@ describe('POST /tasks/:id/approve/:userId', () => {
let syncedTask = find(memberTasks, findAssignedTask); let syncedTask = find(memberTasks, findAssignedTask);
expect(syncedTask.approved).to.be.true; expect(syncedTask.approved).to.be.true;
expect(syncedTask.approvingUser).to.equal(user._id);
expect(syncedTask.approvedDate).to.be.a('string'); // date gets converted to a string as json doesn't have a Date type
}); });
}); });

2
website/server/controllers/api-v3/tasks/groups.js
View File

@@ -219,6 +219,8 @@ api.approveTask = {
if (group.leader !== user._id) throw new NotAuthorized(res.t('onlyGroupLeaderCanEditTasks')); if (group.leader !== user._id) throw new NotAuthorized(res.t('onlyGroupLeaderCanEditTasks'));
task.approvedDate = new Date();
task.approvingUser = user._id;
task.approved = true; task.approved = true;
await task.save(); await task.save();

2
website/server/models/task.js
View File

@@ -74,7 +74,7 @@ export let TaskSchema = new Schema({
requiresApproval: {type: Boolean, default: false}, requiresApproval: {type: Boolean, default: false},
approved: {type: Boolean, default: false}, approved: {type: Boolean, default: false},
approvedDate: {type: Date}, approvedDate: {type: Date},
approvingUser: [{type: String, ref: 'User', validate: [validator.isUUID, 'Invalid uuid.']}], approvingUser: {type: String, ref: 'User', validate: [validator.isUUID, 'Invalid uuid.']},
approvalRequested: {type: Boolean, default: false}, approvalRequested: {type: Boolean, default: false},
approvalRequestedDate: {type: Date}, approvalRequestedDate: {type: Date},