GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bug Fix

Browse source 
- Improved the misleading confirmation for bulk changes.  Now displays
  the task id and description before enumerating differences.
This commit is contained in:
Paul Beckingham 2009-07-05 12:43:03 -04:00
parent 9d85a0e0e2
commit f2af6cc2dd
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/command.cpp
View file

@ -762,6 +762,7 @@ std::string handleDone ()
if (taskDiff (before, *task)) if (taskDiff (before, *task))
{ {
std::cout << "Task " << before.id << " \"" << before.get ("description") << "\"" << std::endl;
std::string question = taskDifferences (before, *task) + "Are you sure?"; std::string question = taskDifferences (before, *task) + "Are you sure?";
if (permission.confirmed (question)) if (permission.confirmed (question))
{ {
@ -907,6 +908,7 @@ std::string handleModify ()
if (taskDiff (before, *other)) if (taskDiff (before, *other))
{ {
std::cout << "Task " << before.id << " \"" << before.get ("description") << "\"" << std::endl;
std::string question = taskDifferences (before, *other) + "Are you sure?"; std::string question = taskDifferences (before, *other) + "Are you sure?";
if (changes && permission.confirmed (question)) if (changes && permission.confirmed (question))
{ {
@ -967,6 +969,7 @@ std::string handleAppend ()
if (taskDiff (before, *other)) if (taskDiff (before, *other))
{ {
std::cout << "Task " << before.id << " \"" << before.get ("description") << "\"" << std::endl;
std::string question = taskDifferences (before, *other) + "Are you sure?"; std::string question = taskDifferences (before, *other) + "Are you sure?";
if (changes && permission.confirmed (question)) if (changes && permission.confirmed (question))
{ {
@ -1253,6 +1256,7 @@ std::string handleAnnotate ()
if (taskDiff (before, *task)) if (taskDiff (before, *task))
{ {
std::cout << "Task " << before.id << " \"" << before.get ("description") << "\"" << std::endl;
std::string question = taskDifferences (before, *task) + "Are you sure?"; std::string question = taskDifferences (before, *task) + "Are you sure?";
if (permission.confirmed (question)) if (permission.confirmed (question))
{ {

8
src/util.cpp
View file

@ -506,7 +506,7 @@ std::string taskDifferences (const Task& before, const Task& after)
out << " - " out << " - "
<< *name << *name
<< " was set to '" << " was set to '"
<< after.get (*name) << renderAttribute (*name, after.get (*name))
<< "'\n"; << "'\n";
foreach (name, beforeAtts) foreach (name, beforeAtts)
@ -516,12 +516,12 @@ std::string taskDifferences (const Task& before, const Task& after)
out << " - " out << " - "
<< *name << *name
<< " was changed from '" << " was changed from '"
<< before.get (*name) << renderAttribute (*name, before.get (*name))
<< "' to '" << "' to '"
<< after.get (*name) << renderAttribute (*name, after.get (*name))
<< "'\n"; << "'\n";
// Can't just say nothing. // Shouldn't just say nothing.
if (out.str ().length () == 0) if (out.str ().length () == 0)
out << " - No changes were made\n"; out << " - No changes were made\n";