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

[Bertrand Rousseau]

[Izidor Matušov (izidor)]

I found a bug in your fix:

1) Open a task editor
2) Set start date to far future, e.g. 2020-01-01
3) Set due date to now or soon
4) Close and reopen the task

Instead of due date as fuzzy date, you get start date. Please, fix it.

review: Needs Fixing (running)

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

1226. By Bertrand Rousseau on 2012-08-12

Fix set_start_date as well to avoid automatic update when using fuzzy due dates

[Bertrand Rousseau (bertrand-rousseau)]

Thanks for noticing that. It should be fixed now.

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

1227. By Bertrand Rousseau on 2012-08-12

Merge trunk

[Lionel Dricot (ploum-deactivatedaccount)]

Works fine for me. Merge accepted.

review: Approve

[Izidor Matušov (izidor)]

Works fine, merging

review: Approve (code, running)

=== modified file 'CHANGELOG'
--- CHANGELOG	2012-08-12 21:17:10 +0000
+++ CHANGELOG	2012-08-12 23:59:20 +0000
@@ -45,6 +45,7 @@
     * Re-enabled support for gtg:// URI
     * Fix for bug #1026400: script_pocketmod doesn't have execute permission
     * Fix for bug #1027817: Export plugin: changing output format moves widgets up and down
+    * 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 23:59:20 +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:
@@ -303,7 +307,9 @@
 
     def set_start_date(self, fulldate):
         self.start_date = Date(fulldate)
-        if Date(fulldate) > self.due_date and Date(fulldate) != Date.no_date():
+        if Date(fulldate) != Date.no_date() and \
+           not self.due_date.is_fuzzy() and \
+           Date(fulldate) > self.due_date:
             self.set_due_date(fulldate)
         self.sync()