Changeset 199 for trunk/grails-app/controllers

Timestamp:

Nov 28, 2009, 2:17:34 PM (15 years ago)

Author:

gav

Message:

Upgrade quartz plugin to 0.4.1 propper.
Refactor and enable quartz scheduling for recurring tasks.
Adjust svn ignores to ignore all log files.
Create a pseudo system person for automated insertions.

Location:

trunk

Files:

• . (modified) (1 prop)
• grails-app/controllers/TaskRecurringScheduleDetailedController.groovy (modified) (6 diffs)

trunk

@@ -1 @@
-stacktrace.log
+*.log
 *.war

@@ -1 @@
-stacktrace.log
+*.log
 *.war

trunk/grails-app/controllers/TaskRecurringScheduleDetailedController.groovy

@@ -31 +31 @@
         if(taskRecurringScheduleInstance) {
             try {
-                taskRecurringScheduleInstance.delete()
+                taskRecurringScheduleInstance.delete(flush: true)
                 flash.message = "Recurring Schedule ${params.id} deleted"
                 redirect(action:list)
@@ -73 +73 @@
                 }
 
-                Date originalDate = taskRecurringScheduleInstance.startDate
+                Date originalDate = taskRecurringScheduleInstance.nextTargetStartDate
                 taskRecurringScheduleInstance.properties = params  // Domain object is now 'dirty'.
-                Date newDate = taskRecurringScheduleInstance.startDate
+                Date newDate = taskRecurringScheduleInstance.nextTargetStartDate
 
-                // If user changes startDate then ensure it is in the future, otherwise it's ok to keep the original date.
+                // 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())
                 {
@@ -83 +83 @@
                     {
                         status.setRollbackOnly()  // Only allow the transaction to Rollback, preventing flush due to 'dirty'.
-                        taskRecurringScheduleInstance.errors.rejectValue("startDate", "taskRecurring.startDate.NotInTheFuture")
+                        taskRecurringScheduleInstance.errors.rejectValue("nextTargetStartDate", "taskRecurring.nextTargetStartDate.NotInTheFuture")
                         render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance])
                         return
@@ -89 +89 @@
                 }
 
-                taskRecurringScheduleInstance.nextTargetStartDate = taskRecurringScheduleInstance.startDate
-                taskRecurringScheduleInstance.setNextGenerationDate() 
+                taskRecurringScheduleInstance.setNextGenerationDate()
                 taskRecurringScheduleInstance.setNextTargetCompletionDate()
 
-                if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save(flush: true)) 
+                if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save(flush: true))
                 {
                     flash.message = "Recurring Schedule ${params.id} updated"
@@ -121 +120 @@
         catch(Exception e) {
             flash.message = "Please select a task, then Create a Recurring Schedule for it"
-            redirect(controller:"taskDetailed", action:"list")
+            redirect(controller:"taskDetailed", action:"search")
         }
     } // end create()
@@ -135 +134 @@
         else {
 
-            if(taskRecurringScheduleInstance.startDate < dateUtilService.getToday()) {
-                taskRecurringScheduleInstance.errors.rejectValue("startDate", "taskRecurring.startDate.NotInTheFuture")
+            if(taskRecurringScheduleInstance.nextTargetStartDate < dateUtilService.getToday()) {
+                taskRecurringScheduleInstance.errors.rejectValue("nextTargetStartDate", "taskRecurring.nextTargetStartDate.NotInTheFuture")
             }
 

@@ -1 @@
-stacktrace.log
+*.log
 *.war