From 6864ff91cddd0276b94ba02bf1c1a4c8ebb0c6e2 Mon Sep 17 00:00:00 2001 From: Cory Donnelly Date: Mon, 19 Jul 2010 10:57:20 -0400 Subject: [PATCH] Bug #434 - Task shouldn't prevent users from marking as done tasks with status:waiting - Users can now complete tasks with status:waiting in addition to status:pending --- ChangeLog | 1 + src/command.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a2c03352..06c4930ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ + Default .taskrc files are now largely empty, and rely almost completed on default values. + Fixed bug #433, making task command output more consistent. + + Fixed bug #434, allowing users to complete tasks with status 'waiting' ------ old releases ------------------------------ diff --git a/src/command.cpp b/src/command.cpp index bafa381d1..2af1f16c7 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -1321,7 +1321,7 @@ int handleDone (std::string &outs) bool nagged = false; foreach (task, tasks) { - if (task->getStatus () == Task::pending) + if ((task->getStatus () == Task::pending) || (task->getStatus () == Task::waiting)) { Task before (*task); @@ -1374,7 +1374,7 @@ int handleDone (std::string &outs) << task->id << " '" << task->get ("description") - << "' is not pending." + << "' is neither pending nor waiting." << std::endl; rc = 1; }