Changeset 582 for trunk/grails-app/controllers

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/controllers/TaskDetailedController.groovy (modified) (3 diffs)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -78 +78 @@
         // Remember sort if supplied, otherwise try to restore.
         if(params.sort && params.order) {
-             session.taskSearchSort = params.sort
-             session.taskSearchOrder = params.order
+            // Reset to defaultSort if requested.
+            if(params.sort == 'defaultSort') {
+                params.sort = null
+                params.order = null
+                session.removeAttribute("taskSearchSort")
+                session.removeAttribute("taskSearchOrder")
+            }
+            else {
+                session.taskSearchSort = params.sort
+                session.taskSearchOrder = params.order
+            }
         }
         else if(session.taskSearchSort && session.taskSearchOrder) {
@@ -88 +97 @@
         if(isFilterApplied) {
             // filterPane:
+            params.sort = params.sort ?: "id"
+            params.order = params.order ?: "desc"
             if(params.sort == "attentionFlag") // See ticket #64 in Trac.
                 params.sort = "id"
@@ -146 +157 @@
         filterParams.max = params.max
         filterParams.offset = params.offset?.toInteger() ?: 0
-        filterParams.sort = params.sort ?: "attentionFlag"
+        filterParams.sort = params.sort ?: "id"
         filterParams.order = params.order ?: "desc"