← Back to team overview

gtg team mailing list archive

[Merge] lp:~bertrand-rousseau/gtg/bugfix-1027844-start-date-not-fuzzy into lp:gtg

 

Bertrand Rousseau has proposed merging lp:~bertrand-rousseau/gtg/bugfix-1027844-start-date-not-fuzzy into lp:gtg.

Requested reviews:
  Gtg developers (gtg)

For more details, see:
https://code.launchpad.net/~bertrand-rousseau/gtg/bugfix-1027844-start-date-not-fuzzy/+merge/119278
-- 
https://code.launchpad.net/~bertrand-rousseau/gtg/bugfix-1027844-start-date-not-fuzzy/+merge/119278
Your team Gtg developers is requested to review the proposed merge of lp:~bertrand-rousseau/gtg/bugfix-1027844-start-date-not-fuzzy into lp:gtg.
=== modified file 'CHANGELOG'
--- CHANGELOG	2012-08-11 15:57:06 +0000
+++ CHANGELOG	2012-08-12 21:03:18 +0000
@@ -43,6 +43,7 @@
     * Fix for bug #1026312: Numbers of tasks in tags pane disappear after a regular search, by Antonio Roquentin
     * Cleaned gtg.desktop file
     * Re-enabled support for gtg:// URI
+    * Fix for bug #1027844: Fuzzy date shouldn't become start date
 
 2012-02-13 Getting Things GNOME! 0.2.9
     * Big refractorization of code, now using liblarch

=== modified file 'GTG/core/task.py'
--- GTG/core/task.py	2012-07-20 09:45:33 +0000
+++ GTG/core/task.py	2012-08-12 21:03:18 +0000
@@ -263,7 +263,9 @@
         self.due_date = fulldate_obj
         # if the task's start date happens later than the 
         # new due date, we update it
+        # (except for fuzzy dates)
         if self.get_start_date() != Date.no_date() and \
+           not fulldate_obj.is_fuzzy() and \
            self.get_start_date() > fulldate_obj:
             self.set_start_date(fulldate)
         if fulldate_obj != Date.no_date():
@@ -290,7 +292,9 @@
                     sub.set_due_date(fulldate)
                 # if the child's start date happens later than
                 # the task's new due date, we update it
+                # (except for fuzzy dates)
                 if sub.get_start_date() != Date.no_date() and \
+                   not fulldate_obj.is_fuzzy() and \
                    sub.get_start_date() > fulldate_obj:
                     sub.set_start_date(fulldate)
         else: