krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed line endings

Browse Source
This commit is contained in:
Keith Holliday
2016-10-08 10:46:11 -05:00
parent 6cbddef627
commit d798ebadfe
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/api/v3/integration/tasks/groups/GET-approvals_group_id.test.js
View File

@@ -2,7 +2,6 @@ import {
createAndPopulateGroup, createAndPopulateGroup,
translate as t, translate as t,
} from '../../../../../helpers/api-integration/v3'; } from '../../../../../helpers/api-integration/v3';
import { v4 as generateUUID } from 'uuid';
import { find } from 'lodash'; import { find } from 'lodash';
describe('GET /approvals/group/:groupId', () => { describe('GET /approvals/group/:groupId', () => {

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

@@ -325,7 +325,7 @@ api.scoreTask = {
task.approvalRequestedDate = new Date(); task.approvalRequestedDate = new Date();
let group = await Group.getGroup({user, groupId: task.group.id, fields: requiredGroupFields}); let group = await Group.getGroup({user, groupId: task.group.id, fields: requiredGroupFields});
let groupLeader = await User.findById(group.leader); //Use this method so we can get access to notifications let groupLeader = await User.findById(group.leader); // Use this method so we can get access to notifications
groupLeader.addNotification('GROUP', { groupLeader.addNotification('GROUP', {
message: res.t('userHasRequestedTaskApproval', { message: res.t('userHasRequestedTaskApproval', {
user: user.auth.local.username, user: user.auth.local.username,