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

Task: Project attributes are exempt from DOM expansion

Browse Source
This commit is contained in:
Paul Beckingham
2015-09-07 16:40:32 -04:00
parent 2854304e60
commit 7a0927effe
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Task.cpp
View File

@@ -2003,8 +2003,11 @@ void Task::modify (modType type, bool text_required /* = false */)
! column->modifiable ()) ! column->modifiable ())
throw format (STRING_INVALID_MOD, name, value); throw format (STRING_INVALID_MOD, name, value);
// Try to evaluate 'value'. It might work. // String type attributes only get DOM resolution, no eval.
Variant evaluatedValue; Variant evaluatedValue;
if (name != "project" || Lexer::isDOM (value))
{
// Try to evaluate 'value'. It might work.
try try
{ {
Eval e; Eval e;
@@ -2019,6 +2022,11 @@ void Task::modify (modType type, bool text_required /* = false */)
{ {
evaluatedValue = Variant (value); evaluatedValue = Variant (value);
} }
}
else
{
evaluatedValue = Variant (value);
}
// Dependencies are specified as IDs. // Dependencies are specified as IDs.
if (name == "depends") if (name == "depends")
@@ -2160,7 +2168,7 @@ void Task::modify (modType type, bool text_required /* = false */)
++modCount; ++modCount;
} }
// String type columns are not eval'd. // String type columns are not eval'd. Welll, not much.
else if (column->type () == "string") else if (column->type () == "string")
{ {
std::string strValue = (std::string) evaluatedValue; std::string strValue = (std::string) evaluatedValue;