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

Bug #737

Browse source 
- Fixed bug #737, which allows wait dates after due dates, but provides a
  warning (thanks to Arkady Grudzinsky).
This commit is contained in:
Paul Beckingham 2011-08-23 21:36:09 -04:00
parent 2e09ddd900
commit 89d3b4e805
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS
View file

@ -107,4 +107,5 @@ suggestions:
Miguel de Val Borro Miguel de Val Borro
Yann Davin Yann Davin
John Hammond John Hammond
Arkady Grudzinsky

2
ChangeLog
View file

@ -126,6 +126,8 @@
truncated to a page. truncated to a page.
+ Fixed bug #732, which fixes misleading messages and documentation for + Fixed bug #732, which fixes misleading messages and documentation for
merge/push/pull URIs (thanks to Tomas Cech). merge/push/pull URIs (thanks to Tomas Cech).
+ Fixed bug #737, which allows wait dates after due dates, but provides a
warning (thanks to Arkady Grudzinsky).
+ Fixed bug #741, which miscounted columns widths when a table header used + Fixed bug #741, which miscounted columns widths when a table header used
unicode characters (thanks to Tomas Cech). unicode characters (thanks to Tomas Cech).
+ Fixed bug #744, which omitted new ID feedback for all but the first + Fixed bug #744, which omitted new ID feedback for all but the first

9
src/Task.cpp
View file

@ -1091,30 +1091,27 @@ void Task::validate () const
Date due (get_date ("due")); Date due (get_date ("due"));
// Verify wait < due // Verify wait < due
// TODO Downgrade to warning.
if (has ("wait")) if (has ("wait"))
{ {
Date wait (get_date ("wait")); Date wait (get_date ("wait"));
if (wait > due) if (wait > due)
throw std::string (STRING_TASK_VALID_WAIT); context.footnote (STRING_TASK_VALID_WAIT);
} }
Date entry (get_date ("entry")); Date entry (get_date ("entry"));
// TODO Downgrade to warning.
if (has ("start")) if (has ("start"))
{ {
Date start (get_date ("start")); Date start (get_date ("start"));
if (entry > start) if (entry > start)
throw std::string (STRING_TASK_VALID_START); context.footnote (STRING_TASK_VALID_START);
} }
// TODO Downgrade to warning.
if (has ("end")) if (has ("end"))
{ {
Date end (get_date ("end")); Date end (get_date ("end"));
if (entry > end) if (entry > end)
throw std::string (STRING_TASK_VALID_END); context.footnote (STRING_TASK_VALID_END);
} }
} }
else else

6
src/en-US.h
View file

@ -419,9 +419,9 @@
#define STRING_TASK_VALID_ENTRY "A task must have an entry timestamp." #define STRING_TASK_VALID_ENTRY "A task must have an entry timestamp."
#define STRING_TASK_VALID_DESC "A task must have a description." #define STRING_TASK_VALID_DESC "A task must have a description."
#define STRING_TASK_VALID_BLANK "Cannot add a task that is blank." #define STRING_TASK_VALID_BLANK "Cannot add a task that is blank."
#define STRING_TASK_VALID_WAIT "A 'wait' date must be before a 'due' date." #define STRING_TASK_VALID_WAIT "Warning: You have specified a 'wait' date that is after the 'due' date."
#define STRING_TASK_VALID_START "A 'start' date must be after an 'entry' date." #define STRING_TASK_VALID_START "Warning: You have specified a 'start' date that is before the 'entry' date."
#define STRING_TASK_VALID_END "An 'end' date must be after an 'entry' date." #define STRING_TASK_VALID_END "Warning: You have specified an 'end' date that is before the 'entry' date."
#define STRING_TASK_VALID_REC_DUE "A recurring task must also have a 'due' date." #define STRING_TASK_VALID_REC_DUE "A recurring task must also have a 'due' date."
#define STRING_TASK_VALID_UNTIL "Only recurring tasks may have an 'until' date." #define STRING_TASK_VALID_UNTIL "Only recurring tasks may have an 'until' date."
#define STRING_TASK_VALID_RECUR "The recurrence value '{1}' is not valid." #define STRING_TASK_VALID_RECUR "The recurrence value '{1}' is not valid."