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

TW-1287: default.* values applied to synced tasks

Browse source 
- Tasks that arrive through "task sync" no longer have defaults applied
  to them.
This commit is contained in:
Wilhelm Schuermann 2015-04-02 12:55:20 +02:00
parent 70d5f595c7
commit c830b4b669
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -1,6 +1,7 @@
2.4.3 () - 2.4.3 () -
- TW-1279 Make default.* not apply to recurring tasks. - TW-1279 Make default.* not apply to recurring tasks.
- TW-1287 Make default.* not apply to synced tasks.
- TW-1578 Bash tab completion problems on first run - TW-1578 Bash tab completion problems on first run
(thanks to Renato Alves and Ptolemarch). (thanks to Renato Alves and Ptolemarch).
- TW-1580 "modified" attribute no longer updated (thanks to David Patrick). - TW-1580 "modified" attribute no longer updated (thanks to David Patrick).

6
src/TDB2.cpp
View file

@ -569,7 +569,9 @@ void TDB2::set_location (const std::string& location)
void TDB2::add (Task& task, bool add_to_backlog /* = true */) void TDB2::add (Task& task, bool add_to_backlog /* = true */)
{ {
// Ensure the task is consistent, and provide defaults if necessary. // Ensure the task is consistent, and provide defaults if necessary.
task.validate (); // bool argument to validate() is "applyDefault". Pass add_to_backlog through
// in order to not apply defaults to synchronized tasks.
task.validate (add_to_backlog);
std::string uuid = task.get ("uuid"); std::string uuid = task.get ("uuid");
// If the tasks are loaded, then verify that this uuid is not already in // If the tasks are loaded, then verify that this uuid is not already in
@ -588,7 +590,7 @@ void TDB2::add (Task& task, bool add_to_backlog /* = true */)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void TDB2::modify (Task& task, bool add_to_backlog /* = true */) void TDB2::modify (Task& task, bool add_to_backlog /* = true */)
{ {
// Ensure the task is consistent, and provide defaults if necessary. // Ensure the task is consistent.
task.validate (false); task.validate (false);
std::string uuid = task.get ("uuid"); std::string uuid = task.get ("uuid");