Changeset 588

Timestamp:

Jun 9, 2010, 11:51:58 AM (15 years ago)

Author:

gav

Message:

Revert task searchCalendar to displaying tasks, the rest of ticket #66 remains and may be shown on another calendar view at a later date.

Location:

trunk/grails-app

Files:

• controllers/TaskDetailedController.groovy (modified) (3 diffs)
• views/taskDetailed/searchCalendar.gsp (modified) (1 diff)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -263 +263 @@
         }
 
-        displayList = taskReportService.getWorkLoadSummary(
-                                    [taskInstanceList: taskInstanceList], RCU.getLocale(request)
-                                ).displayList
+//         displayList = taskReportService.getWorkLoadSummary(
+//                                     [taskInstanceList: taskInstanceList], RCU.getLocale(request)
+//                                 ).displayList
 
         // export plugin:
@@ -292 +292 @@
         }
 
-//         if(taskInstanceTotal > params.max)
-//             params.errorMessage = g.message(code:"task.search.calendar.text.too.many.results", args:[params.max])
+        if(taskInstanceTotal > params.max)
+            params.errorMessage = g.message(code:"task.search.calendar.text.too.many.results", args:[params.max])
 
         // Add some basic params to filterParams.
@@ -299 +299 @@
         filterParams.offset = params.offset?.toInteger() ?: 0
 
-        return[displayList: displayList,
-                        taskInstanceList: taskInstanceList,
+        return[taskInstanceList: taskInstanceList,
                         taskInstanceTotal: taskInstanceTotal,
                         filterParams: filterParams,

trunk/grails-app/views/taskDetailed/searchCalendar.gsp

@@ -101 +101 @@
                     <br />
 
-                <richui:calendarMonthView items="${displayList}"
-                                                                        displayField="text"
-                                                                        createLink="false"
-                                                                        constraintDateFields="['date']"
+                <richui:calendarMonthView items="${taskInstanceList}"
+                                                                        createLink="true"
+                                                                        constraintDateFields="['targetStartDate']"
                                                                         month="${showDate}"
                                                                         controller="taskDetailed"