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

Make modify and delete commands respect rc.recurrence.confirmation config option.

Browse Source
This commit is contained in:
HTunne
2020-09-20 12:14:30 +01:00
committed by Paul Beckingham
parent c47c7536f5
commit 75c0e41fcc
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/commands/CmdDelete.cpp
View File

@@ -137,9 +137,10 @@ int CmdDelete::execute (std::string&)
else else
{ {
std::vector <Task> children = Context::getContext ().tdb2.children (task); std::vector <Task> children = Context::getContext ().tdb2.children (task);
if (children.size () && if (children.size() &&
(Context::getContext ().config.getBoolean ("recurrence.confirmation") || ((Context::getContext ().config.get ("recurrence.confirmation") == "prompt"
confirm (STRING_CMD_DELETE_CONFIRM_R))) && confirm (STRING_CMD_DELETE_CONFIRM_R)) ||
Context::getContext ().config.getBoolean ("recurrence.confirmation")))
{ {
for (auto& child : children) for (auto& child : children)
{ {

5
src/commands/CmdModify.cpp
View File

@@ -200,8 +200,9 @@ int CmdModify::modifyRecurrenceParent (
auto children = Context::getContext ().tdb2.children (task); auto children = Context::getContext ().tdb2.children (task);
if (children.size () && if (children.size () &&
(! Context::getContext ().config.getBoolean ("recurrence.confirmation") || ((Context::getContext ().config.get ("recurrence.confirmation") == "prompt"
confirm (STRING_CMD_MODIFY_RECUR))) && confirm (STRING_CMD_MODIFY_RECUR)) ||
Context::getContext ().config.getBoolean ("recurrence.confirmation")))
{ {
for (auto& child : children) for (auto& child : children)
{ {