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

TW01438

Browse Source 
- TW-1438 Configuration setting rc.confirmation=no no longer disables
          confirmation requests (thanks to Adam Coddington).
This commit is contained in:
Paul Beckingham
2014-11-10 20:05:28 -05:00
parent fd518e3fce
commit 9936157704
11 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Config.cpp
View File

@@ -82,6 +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"
"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"

3
src/commands/CmdAnnotate.cpp
View File

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

3
src/commands/CmdAppend.cpp
View File

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

6
src/commands/CmdDelete.cpp
View File

@@ -103,7 +103,8 @@ int CmdDelete::execute (std::string& output)
// Delete siblings.
if (task->has ("parent"))
{
if (confirm (STRING_CMD_DELETE_CONFIRM_R))
if (! context.config.getBoolean ("recurrence.confirmation") ||
confirm (STRING_CMD_DELETE_CONFIRM_R))
{
std::vector <Task> siblings = context.tdb2.siblings (*task);
std::vector <Task>::iterator sibling;
@@ -137,7 +138,8 @@ int CmdDelete::execute (std::string& output)
{
std::vector <Task> children = context.tdb2.children (*task);
if (children.size () &&
confirm (STRING_CMD_DELETE_CONFIRM_R))
(context.config.getBoolean ("recurrence.confirmation") ||
confirm (STRING_CMD_DELETE_CONFIRM_R)))
{
std::vector <Task>::iterator child;
for (child = children.begin (); child != children.end (); ++child)

6
src/commands/CmdModify.cpp
View File

@@ -117,7 +117,8 @@ int CmdModify::execute (std::string& output)
// Task potentially has siblings - modify them.
if (task->has ("parent"))
{
if (confirm (STRING_CMD_MODIFY_RECUR))
if (! context.config.getBoolean ("recurrence.confirmation") ||
confirm (STRING_CMD_MODIFY_RECUR))
{
std::vector <Task> siblings = context.tdb2.siblings (*task);
std::vector <Task>::iterator sibling;
@@ -148,7 +149,8 @@ int CmdModify::execute (std::string& output)
{
std::vector <Task> children = context.tdb2.children (*task);
if (children.size () &&
confirm (STRING_CMD_MODIFY_RECUR))
(! context.config.getBoolean ("recurrence.confirmation") ||
confirm (STRING_CMD_MODIFY_RECUR)))
{
std::vector <Task>::iterator child;
for (child = children.begin (); child != children.end (); ++child)

3
src/commands/CmdPrepend.cpp
View File

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

1
src/commands/CmdShow.cpp
View File

@@ -171,6 +171,7 @@ int CmdShow::execute (std::string& output)
" monthsperline"
" nag"
" print.empty.columns"
" recurrence.confirmation"
" recurrence.indicator"
" recurrence.limit"
" regex"