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

TW-1881: default.scheduled seems not to work

Browse Source 
- Thanks to Onion.
This commit is contained in:
Paul Beckingham
2017-01-16 20:25:58 -05:00
parent a60c373caf
commit 5ff5a5c1ae
9 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Task.cpp
View File

@@ -67,10 +67,11 @@ extern Task& contextTask;
static const float epsilon = 0.000001;
#endif
std::string Task::defaultProject = "";
std::string Task::defaultDue = "";
bool Task::searchCaseSensitive = true;
bool Task::regex = false;
std::string Task::defaultProject = "";
std::string Task::defaultDue = "";
std::string Task::defaultScheduled = "";
bool Task::searchCaseSensitive = true;
bool Task::regex = false;
std::map <std::string, std::string> Task::attributes;
std::map <std::string, float> Task::coefficients;
@@ -1565,6 +1566,20 @@ void Task::validate (bool applyDefault /* = true */)
}
}
// Override with default.scheduled, if not specified.
if (Task::defaultScheduled != "" &&
! has ("scheduled"))
{
if (context.columns["scheduled"]->validate (Task::defaultScheduled))
{
Duration dur (Task::defaultScheduled);
if (dur.toTime_t () != 0)
set ("scheduled", (Datetime () + dur.toTime_t ()).toEpoch ());
else
set ("scheduled", Datetime (Task::defaultScheduled).toEpoch ());
}
}
// If a UDA has a default value in the configuration,
// override with uda.(uda).default, if not specified.
// Gather a list of all UDAs with a .default value
@@ -2044,8 +2059,9 @@ void Task::modify (modType type, bool text_required /* = false */)
// ::composeF4 will skip if the value is blank, but the presence of
// the attribute will prevent ::validate from applying defaults.
if ((has (name) && get (name) != "") ||
(name == "due" && context.config.has ("default.due")) ||
(name == "project" && context.config.has ("default.project")))
(name == "due" && context.config.has ("default.due")) ||
(name == "scheduled" && context.config.has ("default.scheduled")) ||
(name == "project" && context.config.has ("default.project")))
{
mods = true;
set (name, "");