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

Fix #7388 - Invert tag collapse when adding tasks

Browse Source
This commit is contained in:
MathWhiz
2016-05-30 13:33:54 -05:00
committed by Blade Barringer
parent 6e78a14f87
commit 7a9e50dbba
2 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/script/ops/addTask.js
View File

@@ -7,17 +7,9 @@ module.exports = function addTask (user, req = {body: {}}) {
user.tasksOrder[`${task.type}s`].unshift(task._id); user.tasksOrder[`${task.type}s`].unshift(task._id);
user[`${task.type}s`].unshift(task); user[`${task.type}s`].unshift(task);
if (user.preferences.newTaskEdit) { task._editing = user.preferences.newTaskEdit;
task._editing = true; task._tags = !user.preferences.tagsCollapsed;
} task._advanced = !user.preferences.advancedCollapsed;
if (user.preferences.tagsCollapsed) {
task._tags = true;
}
if (!user.preferences.advancedCollapsed) {
task._advanced = true;
}
return task; return task;
}; };

34
test/common/ops/addTask.js
View File

@@ -113,27 +113,29 @@ describe('shared.ops.addTask', () => {
expect(reward.up).to.not.exists; expect(reward.up).to.not.exists;
}); });
context('respects preferences', () => { context('user preferences', () => {
it('true', () => { it('respects newTaskEdit preference', () => {
user.preferences.newTaskEdit = true; user.preferences.newTaskEdit = true;
user.preferences.tagsCollapsed = true; expect(addTask(user)._editing).to.be.ok;
user.preferences.advancedCollapsed = false;
let task = addTask(user);
expect(task._editing).to.be.true; user.preferences.newTaskEdit = false;
expect(task._tags).to.be.true; expect(addTask(user)._editing).not.be.ok
expect(task._advanced).to.be.true;
}); });
it('false', () => { it('respects tagsCollapsed preference', () => {
user.preferences.newTaskEdit = false; user.preferences.tagsCollapsed = true;
user.preferences.tagsCollapsed = false; expect(addTask(user)._tags).to.not.be.ok;
user.preferences.advancedCollapsed = true;
let task = addTask(user);
expect(task._editing).to.not.exists; user.preferences.tagsCollapsed = false;
expect(task._tags).to.not.exists; expect(addTask(user)._tags).to.be.ok;
expect(task._advanced).to.not.exists; });
it('respects advancedCollapsed preference', () => {
user.preferences.advancedCollapsed = true;
expect(addTask(user)._advanced).not.be.ok
user.preferences.advancedCollapsed = false;
expect(addTask(user)._advanced).to.be.ok;
}); });
}); });
}); });