gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

TW-1, TW-1438

Browse Source 
- TW-1 Recurring task message on the same task (thanks to Profpatsch).
This commit is contained in:
Paul Beckingham
2014-12-26 10:16:11 -05:00
parent 8795b0a692
commit 1488c1c6fa
9 changed files with 128 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.cpp
View File

@@ -82,7 +82,7 @@ std::string Config::_defaults =
"# # Comma-separated list. May contain any subset of:\n"
"#verbose=blank,header,footnote,label,new-id,new-uuid,affected,edit,special,project,sync,filter\n"
"confirmation=yes # Confirmation on delete, big changes\n"
"recurrence.confirmation=yes # Confirmation for propagating changes among recurring tasks\n"
"recurrence.confirmation=prompt # Confirmation for propagating changes among recurring tasks (yes/no/prompt)\n"
"allow.empty.filter=yes # An empty filter gets a warning and requires confirmation\n"
"indent.annotation=2 # Indent spaces for annotations\n"
"indent.report=0 # Indent spaces for whole report\n"

5
src/commands/CmdAnnotate.cpp
View File

@@ -90,8 +90,9 @@ int CmdAnnotate::execute (std::string& output)
// Annotate siblings.
if (task->has ("parent"))
{
if (! context.config.getBoolean ("recurrence.confirmation") ||
confirm (STRING_CMD_ANNO_CONFIRM_R))
if ((context.config.get ("recurrence.confirmation") == "prompt"
&& confirm (STRING_CMD_ANNO_CONFIRM_R)) ||
context.config.getBoolean ("recurrence.confirmation"))
{
std::vector <Task> siblings = context.tdb2.siblings (*task);
std::vector <Task>::iterator sibling;

5
src/commands/CmdAppend.cpp
View File

@@ -90,8 +90,9 @@ int CmdAppend::execute (std::string& output)
// Append to siblings.
if (task->has ("parent"))
{
if (! context.config.getBoolean ("recurrence.confirmation") ||
confirm (STRING_CMD_APPEND_CONFIRM_R))
if ((context.config.get ("recurrence.confirmation") == "prompt"
&& confirm (STRING_CMD_APPEND_CONFIRM_R)) ||
context.config.getBoolean ("recurrence.confirmation"))
{
std::vector <Task> siblings = context.tdb2.siblings (*task);
std::vector <Task>::iterator sibling;

5
src/commands/CmdDelete.cpp
View File

@@ -103,8 +103,9 @@ int CmdDelete::execute (std::string& output)
// Delete siblings.
if (task->has ("parent"))
{
if (! context.config.getBoolean ("recurrence.confirmation") ||
confirm (STRING_CMD_DELETE_CONFIRM_R))
if ((context.config.get ("recurrence.confirmation") == "prompt"
&& confirm (STRING_CMD_DELETE_CONFIRM_R)) ||
context.config.getBoolean ("recurrence.confirmation"))
{
std::vector <Task> siblings = context.tdb2.siblings (*task);
std::vector <Task>::iterator sibling;

5
src/commands/CmdModify.cpp
View File

@@ -117,8 +117,9 @@ int CmdModify::execute (std::string& output)
// Task potentially has siblings - modify them.
if (task->has ("parent"))
{
if (! context.config.getBoolean ("recurrence.confirmation") ||
confirm (STRING_CMD_MODIFY_RECUR))
if ((context.config.get ("recurrence.confirmation") == "prompt"
&& confirm (STRING_CMD_MODIFY_RECUR)) ||
context.config.getBoolean ("recurrence.confirmation"))
{
std::vector <Task> siblings = context.tdb2.siblings (*task);
std::vector <Task>::iterator sibling;

5
src/commands/CmdPrepend.cpp
View File

@@ -90,8 +90,9 @@ int CmdPrepend::execute (std::string& output)
// Prepend to siblings.
if (task->has ("parent"))
{
if (! context.config.getBoolean ("recurrence.confirmation") ||
confirm (STRING_CMD_PREPEND_CONFIRM_R))
if ((context.config.get ("recurrence.confirmation") == "prompt"
&& confirm (STRING_CMD_PREPEND_CONFIRM_R)) ||
context.config.getBoolean ("recurrence.confirmation"))
{
std::vector <Task> siblings = context.tdb2.siblings (*task);
std::vector <Task>::iterator sibling;