- TW-1498 Filtering for presence of UDA matches all tasks (thanks to Ralph Bean).
This commit is contained in:
Paul Beckingham 2015-01-10 14:36:21 -05:00
parent 588009d679
commit cdde747733
2 changed files with 15 additions and 2 deletions

View file

@ -4,14 +4,15 @@
Sujeevan Vijayakumaran). Sujeevan Vijayakumaran).
- TW-1492 compiling v2.4.0 using musl(libc) (thanks to V.Krishn). - TW-1492 compiling v2.4.0 using musl(libc) (thanks to V.Krishn).
- TW-1495 German translation for taskwarrior (thanks to Jens Erat). - TW-1495 German translation for taskwarrior (thanks to Jens Erat).
- TW-1498 Filtering for presence of UDA matches all tasks (thanks to Ralph Bean).
- TW-1501 Calc can't handle multi-digit numbers in some expressions (thanks to - TW-1501 Calc can't handle multi-digit numbers in some expressions (thanks to
Jeremy John Reeder). Jeremy John Reeder).
- TW-1505 completely ignore mis-named hook scripts (thanks to Tomas Babej,
David Patrick).
- Fixed assorted color theme problems. - Fixed assorted color theme problems.
- Changed assorted reports so they do not use '.age' format for dates that are - Changed assorted reports so they do not use '.age' format for dates that are
in the future, because those are never shown with this format (thanks to in the future, because those are never shown with this format (thanks to
Sujeevan Vijayakumaran). Sujeevan Vijayakumaran).
- The 'diag' command should indicate misnamed hook scripts (thanks to Tomas
Babej).
------ current release --------------------------- ------ current release ---------------------------

View file

@ -240,6 +240,12 @@ bool DOM::get (const std::string& name, const Task& task, Variant& value)
Column* column = context.columns[canonical]; Column* column = context.columns[canonical];
if (column) if (column)
{ {
if (column->is_uda () && ! task.has (canonical))
{
value = Variant ("''");
return true;
}
if (column->type () == "date") if (column->type () == "date")
value = Variant (task.get_date (canonical), Variant::type_date); value = Variant (task.get_date (canonical), Variant::type_date);
else if (column->type () == "duration" || canonical == "recur") else if (column->type () == "duration" || canonical == "recur")
@ -307,6 +313,12 @@ bool DOM::get (const std::string& name, const Task& task, Variant& value)
Column* column = context.columns[canonical]; Column* column = context.columns[canonical];
if (column) if (column)
{ {
if (column->is_uda () && ! task.has (canonical))
{
value = Variant ("''");
return true;
}
if (column->type () == "date") if (column->type () == "date")
value = Variant (ref.get_date (canonical), Variant::type_date); value = Variant (ref.get_date (canonical), Variant::type_date);
else if (column->type () == "duration") else if (column->type () == "duration")