Changeset 516

Timestamp:

May 1, 2010, 2:20:33 AM (14 years ago)

Author:

gav

Message:

Prevent tasks in the trash being returned by filterPane unless explicitly requested.

File:

• trunk/grails-app/controllers/TaskDetailedController.groovy (modified) (2 diffs)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -90 +90 @@
             if(params.sort == "attentionFlag") // See ticket #64 in Trac.
                 params.sort = "id"
+            // Prevent tasks in the trash being returned unless explicitly requested.
+            if(!params.filter.op.trash) {
+                params.filter.op.trash = "Equal"
+                params.filter.trash = "false"
+            }
+            // Call filterService.
             taskInstanceList = filterService.filter( params, Task )
             taskInstanceTotal = filterService.count( params, Task )
@@ -198 +204 @@
         if(isFilterApplied) {
             // filterPane:
+            if(params.sort == "attentionFlag") // See ticket #64 in Trac.
+                params.sort = "id"
+            // Prevent tasks in the trash being returned unless explicitly requested.
+            if(!params.filter.op.trash) {
+                params.filter.op.trash = "Equal"
+                params.filter.trash = "false"
+            }
+            // Call filterService.
             taskInstanceList = filterService.filter( params, Task )
             taskInstanceTotal = filterService.count( params, Task )