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

Tasks tags (#9112)

Browse Source 
* Added auto apply and exit

* Add challenge tag editing

* Fixed lint
This commit is contained in:
Keith Holliday
2017-09-30 21:49:00 -05:00
committed by GitHub
parent c9b99d1ecf
commit dbf9fd54be
3 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/server/controllers/api-v3/user.js
View File

@@ -20,7 +20,6 @@ import {
} from '../../libs/email';
import nconf from 'nconf';
import get from 'lodash/get';
import { model as Tag } from '../../models/tag';
const TECH_ASSISTANCE_EMAIL = nconf.get('EMAILS:TECH_ASSISTANCE_EMAIL');
const DELETE_CONFIRMATION = 'DELETE';
@@ -305,7 +304,7 @@ api.updateUser = {
// Keep challenge and group tags
user.tags.forEach(t => {
if (t.group || t.challenge) {
if (t.group) {
oldTags.push(t);
} else {
removedTagsIds.push(t.id);
@@ -320,7 +319,7 @@ api.updateUser = {
removedTagsIds.splice(oldI, 1);
}
user.tags.push(Tag.sanitize(t));
user.tags.push(t);
});
// Remove from all the tasks