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

Merge remote-tracking branch 'origin/develop' into qa/bat

Browse Source
This commit is contained in:
Hafiz
2025-08-12 09:46:07 -05:00
parent 2ea0b64603 876d5a67d6
commit 9a1fb18959
128 changed files with 612 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/server/controllers/api-v4/admin.js
View File

@@ -1,5 +1,5 @@
import validator from 'validator';
import _ from 'lodash';
import merge from 'lodash/merge';
import { v4 as uuid } from 'uuid';
import { authWithHeaders } from '../../middlewares/auth';
import { ensurePermission } from '../../middlewares/ensureAccessRight';
@@ -161,7 +161,7 @@ api.updateBlocker = {
const blocker = await Blocker.findById(req.params.blockerId).exec();
if (!blocker) throw new NotFound(res.t('blockerNotFound'));
_.merge(blocker, Blocker.sanitize(req.body));
merge(blocker, Blocker.sanitize(req.body));
const savedBlocker = await blocker.save();
res.respond(200, savedBlocker);
@@ -187,5 +187,4 @@ api.deleteBlocker = {
res.respond(200, savedBlocker);
},
};
export default api;