Group approval ui (#8184)

* Added all ui components back

* Added group ui items back and initial group approval directive

* Added ability to mark tasks as requires approval. Added approvals ctrl. Added get approvals method to tasks service

* Added approval list view with approving functionality

* Added error to produce message when task requests approval

* Added notification display for group approvals

* Fixed notification read and adding task

* Fixed syncing with group approval required

* Added group id to notifications for redirect on client side

* Fixed approval request tests

* Fixed linting issues

* Removed expectation from beforeEach

* Moved string to locale

* Added eslint ignore

* Updated notification for group approved, added new icons, and updated styles

* Hid group plan ui
This commit is contained in:
Keith Holliday
2016-11-12 16:47:45 -06:00
committed by Matteo Pagliazzi
parent 3ff7692528
commit 13df60e0dd
25 changed files with 218 additions and 43 deletions

View File

@@ -263,6 +263,10 @@ api.updateTask = {
// repeat is always among modifiedPaths because mongoose changes the other of the keys when using .toObject()
// see https://github.com/Automattic/mongoose/issues/2749
if (sanitizedObj.requiresApproval) {
task.group.approval.required = true;
}
let savedTask = await task.save();
if (group && task.group.id && task.group.assignedUsers.length > 0) {
@@ -331,11 +335,12 @@ api.scoreTask = {
user: user.profile.name,
taskName: task.text,
}),
groupId: group._id,
});
await Bluebird.all([groupLeader.save(), task.save()]);
return res.respond(200, {message: res.t('taskApprovalHasBeenRequested'), task});
throw new NotAuthorized(res.t('taskApprovalHasBeenRequested'));
}
let wasCompleted = task.completed;