Changeset 709 for trunk/grails-app/controllers

Timestamp:

Nov 15, 2010, 12:04:41 PM (14 years ago)

Author:

gav

Message:

Return error message on immediate callouts report submit when endDate < startDate.

File:

• trunk/grails-app/controllers/ReportController.groovy (modified) (1 diff)

trunk/grails-app/controllers/ReportController.groovy

@@ -112 +112 @@
         params.endDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: params.endDate)
 
-        def dataModel = taskReportService.getImmediateCallouts(params, RCU.getLocale(request))
-
-        // Jasper plugin controller expects data to be a Collection.
-        chain(controller:'jasper', action:'index', model:[data: [dataModel]], params:params)
+        def result = taskReportService.getImmediateCallouts(params, RCU.getLocale(request))
+
+        if(!result.error) {
+            // Jasper plugin controller expects data to be a Collection.
+            chain(controller:'jasper', action:'index', model:[data: [result]], params:params)
+            return
+        }
+
+        flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
+        redirect(controller: 'appCore', action: 'start', params: [showTab:'showReportsTab'])
 
     } // immediateCallouts