GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-30 11:27:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bug #946

Browse source 
- Fixed bug #946, which caused 'edit' command problems when
  'dateformat.annotation' did not contain any date elements (thanks to Tuomas
  Toivola).
This commit is contained in:
Paul Beckingham 2012-03-14 00:17:56 -04:00
parent 99e058cbe7
commit 948bbe8745
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS
View file

@ -126,4 +126,5 @@ suggestions:
Peter Lewis Peter Lewis
Najmi Ahmad Zabidi Najmi Ahmad Zabidi
Philipp Woelfel Philipp Woelfel
Tuomas Toivola

4
ChangeLog
View file

@ -280,7 +280,11 @@
+ Fixed bug #938, which corrected compiler warnings on Solaris (thanks to Owen + Fixed bug #938, which corrected compiler warnings on Solaris (thanks to Owen
Clarke). Clarke).
+ Fixed bug #944, which caused a test to fail when it was run on an NFS share. + Fixed bug #944, which caused a test to fail when it was run on an NFS share.
+ Fixed bug #946, which caused 'edit' command problems when
'dateformat.annotation' did not contain any date elements (thanks to Tuomas
Toivola).
+ Fixed bug #951, which caused tag filtering to fail (thanks to Max Muller). + Fixed bug #951, which caused tag filtering to fail (thanks to Max Muller).
+ Fixed bug #952, which generated cmake warnings on Cygwin.
# Untracked Bugs, biggest first. # Untracked Bugs, biggest first.
+ Fixed bug that required the '%YAML' prologue in a YAML import. + Fixed bug that required the '%YAML' prologue in a YAML import.

4
src/commands/CmdEdit.cpp
View file

@ -204,12 +204,12 @@ std::string CmdEdit::formatTask (Task task)
for (anno = annotations.begin (); anno != annotations.end (); ++anno) for (anno = annotations.begin (); anno != annotations.end (); ++anno)
{ {
Date dt (strtol (anno->first.substr (11).c_str (), NULL, 10)); Date dt (strtol (anno->first.substr (11).c_str (), NULL, 10));
before << " Annotation: " << dt.toString (context.config.get ("dateformat.annotation")) before << " Annotation: " << dt.toString (context.config.get ("dateformat"))
<< " -- " << anno->second << "\n"; << " -- " << anno->second << "\n";
} }
Date now; Date now;
before << " Annotation: " << now.toString (context.config.get ("dateformat.annotation")) << " -- \n"; before << " Annotation: " << now.toString (context.config.get ("dateformat")) << " -- \n";
// Add dependencies here. // Add dependencies here.
std::vector <std::string> dependencies; std::vector <std::string> dependencies;