GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch '2.4.0' of ssh://git.tasktools.org/tm/task into 2.4.0

Browse source
This commit is contained in:
Paul Beckingham 2014-05-10 11:46:35 -04:00
commit e1eb3acc1c
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS
View file

@ -209,3 +209,4 @@ suggestions:
Profpatsch Profpatsch
Bernd Humpa Bernd Humpa
darkfeline darkfeline
Onion

2
ChangeLog
View file

@ -52,6 +52,8 @@
- TW-1307 burndown is aliased to burndown.weekly (thanks to darkfeline). - TW-1307 burndown is aliased to burndown.weekly (thanks to darkfeline).
- TW-1309 memory error, if misconfigured calendar.details.report (thanks to - TW-1309 memory error, if misconfigured calendar.details.report (thanks to
Onion). Onion).
- TW-1318 creating a UDA in the wrong sequence will cripple taskwarrior (thanks
to Onion).
- Removed deprecated 'echo.command' setting, in favor of the 'header' and - Removed deprecated 'echo.command' setting, in favor of the 'header' and
'affected' verbosity tokens. 'affected' verbosity tokens.
- Removed deprecated 'edit.verbose' setting, in favor of the 'edit' verbosity - Removed deprecated 'edit.verbose' setting, in favor of the 'edit' verbosity

5
src/columns/Column.cpp
View file

@ -183,12 +183,13 @@ Column* Column::uda (const std::string& name)
std::string key = "uda." + name + ".type"; std::string key = "uda." + name + ".type";
c->_type = context.config.get (key); c->_type = context.config.get (key);
if (c->_type == "") if (c->_type == "")
throw format (STRING_UDA_TYPE_MISSING, name); context.error (format (STRING_UDA_TYPE_MISSING, name));
if (c->_type != "string" && if (c->_type != "string" &&
c->_type != "date" && c->_type != "date" &&
c->_type != "duration" && c->_type != "duration" &&
c->_type != "numeric") c->_type != "numeric")
throw std::string (STRING_UDA_TYPE); context.error (STRING_UDA_TYPE);
key = "uda." + name + ".label"; key = "uda." + name + ".label";
if (context.config.get (key) != "") if (context.config.get (key) != "")