Changeset 213 for trunk/grails-app/services

Timestamp:

Dec 3, 2009, 11:44:05 PM (15 years ago)

Author:

gav

Message:

Finishing touches to recurring tasks.

File:

• trunk/grails-app/services/TaskRecurringScheduleService.groovy (modified) (2 diffs)

trunk/grails-app/services/TaskRecurringScheduleService.groovy

@@ -74 +74 @@
 
             if(result.taskRecurringScheduleInstance.nextTargetStartDate < dateUtilService.getToday())
-                return fail("nextTargetStartDate", "taskRecurring.nextTargetStartDate.NotInTheFuture")
+                return fail("nextTargetStartDate", "taskRecurringSchedule.nextTargetStartDate.mayNotBePast")
 
             taskInstance.taskRecurringSchedule = result.taskRecurringScheduleInstance
@@ -115 +115 @@
             }
 
-            result.taskRecurringScheduleInstance.validate()
+            result.taskRecurringScheduleInstance.properties = params
 
-            Date originalDate = result.taskRecurringScheduleInstance.nextTargetStartDate
-            result.taskRecurringScheduleInstance.properties = params
-            Date newDate = result.taskRecurringScheduleInstance.nextTargetStartDate
-
-            // If user changes nextTargetStartDate then ensure it is in the future, otherwise it's ok to keep the original date.
-            if(originalDate.getTime() != newDate.getTime())
-            {
-                if(newDate < dateUtilService.getToday())
-                    return fail("nextTargetStartDate", "taskRecurring.nextTargetStartDate.NotInTheFuture")
-            }
+            if(result.taskRecurringScheduleInstance.nextTargetStartDate < dateUtilService.getToday())
+                return fail("nextTargetStartDate", "taskRecurringSchedule.nextTargetStartDate.mayNotBePast")
 
             result.taskRecurringScheduleInstance.setNextGenerationDate()