Changeset 582 for trunk/grails-app/services

Timestamp:

Jun 8, 2010, 4:28:09 PM (15 years ago)

Author:

gav

Message:

New defaultSort for Tasks, sort by status then priority then target start date.
Small improvement to custom:sortableColumnWithImg to allow imgTitle to be specified.

File:

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

trunk/grails-app/services/TaskSearchService.groovy

@@ -161 +161 @@
         paginateParams.offset = params?.offset?.toInteger() ?: 0
 
-        def sort = "task." + (params?.sort ?: "attentionFlag")
-        def order = params?.order == "asc" ? "asc" : "desc"
-        def orderBy = " order by " + sort + ' ' + order
+        def orderBy = ''
+        if(params.sort?.contains('.')) // protect against filterpane bug.
+            params.sort = null
+        if(params.sort && params.order) {
+            def sort = "task." + params.sort
+            def order = (params.order == "asc") ? "asc" : "desc"
+            orderBy = " order by " + sort + ' ' + order
+        }
+        else
+            orderBy = " order by task.taskStatus, task.taskPriority, task.targetStartDate"
 
         def namedParams = [:]
@@ -198 +205 @@
         paginateParams.offset = params?.offset?.toInteger() ?: 0
 
-        def sort = "task." + (params?.sort ?: "attentionFlag")
-        def order = params?.order == "asc" ? "asc" : "desc"
-        def orderBy = " order by " + sort + ' ' + order
+        def orderBy = ''
+        if(params.sort?.contains('.')) // protect against filterpane bug.
+            params.sort = null
+        if(params.sort && params.order) {
+            def sort = "task." + params.sort
+            def order = (params.order == "asc") ? "asc" : "desc"
+            orderBy = " order by " + sort + ' ' + order
+        }
+        else
+            orderBy = " order by task.taskStatus, task.taskPriority, task.targetStartDate"
 
         def namedParams = [:]