Merge develop to release (#9115)

* Some random quick (#9111)

* Switch group button directions

* Allowed admins to export challenges

* Added scoping to some stable styles

* Fixed challenge cloning

* Tasks tags (#9112)

* Added auto apply and exit

* Add challenge tag editing

* Fixed lint

* Skill fixes (#9113)

* Added local storage setting for spell drawer

* Added new spell styles

* Fixed typo

* Reset local creds if access is denied (#9114)
This commit is contained in:
Keith Holliday
2017-09-30 23:54:12 -05:00
committed by GitHub
parent fd8120c80d
commit 8eb7c67f12
11 changed files with 137 additions and 64 deletions

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