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

Checked to ensure tasks has checklists before attempting to sync last checklist item (#8314)

Browse Source
This commit is contained in:
Keith Holliday
2016-12-25 15:00:41 -06:00
committed by GitHub
parent 1f95376d39
commit 7fbd38d18c
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
website/client-old/js/components/groupTasks/groupTasksController.js
View File

@@ -76,21 +76,23 @@ habitrpg.controller('GroupTasksCtrl', ['$scope', 'Shared', 'Tasks', 'User', func
}; };
$scope.saveTask = function(task, stayOpen, isSaveAndClose) { $scope.saveTask = function(task, stayOpen, isSaveAndClose) {
// Check if we have a lingering checklist that the enter button did not trigger on if (task._edit.checklist) {
var lastIndex = task._edit.checklist.length - 1; // Check if we have a lingering checklist that the enter button did not trigger on
var lastCheckListItem = task._edit.checklist[lastIndex]; var lastIndex = task._edit.checklist.length - 1;
if (lastCheckListItem && !lastCheckListItem.id && lastCheckListItem.text) { var lastCheckListItem = task._edit.checklist[lastIndex];
Tasks.addChecklistItem(task._id, lastCheckListItem) if (lastCheckListItem && !lastCheckListItem.id && lastCheckListItem.text) {
.then(function (response) { Tasks.addChecklistItem(task._id, lastCheckListItem)
task._edit.checklist[lastIndex] = response.data.data.checklist[lastIndex]; .then(function (response) {
task.checklist[lastIndex] = response.data.data.checklist[lastIndex]; task._edit.checklist[lastIndex] = response.data.data.checklist[lastIndex];
Tasks.saveTask(task, stayOpen, isSaveAndClose); task.checklist[lastIndex] = response.data.data.checklist[lastIndex];
Tasks.updateTask(task._id, task); Tasks.saveTask(task, stayOpen, isSaveAndClose);
}); Tasks.updateTask(task._id, task);
} else { });
Tasks.saveTask (task, stayOpen, isSaveAndClose); return;
Tasks.updateTask(task._id, task); }
} }
Tasks.saveTask (task, stayOpen, isSaveAndClose);
Tasks.updateTask(task._id, task);
}; };
$scope.shouldShow = function(task, list, prefs){ $scope.shouldShow = function(task, list, prefs){