Changeset 595 for trunk/grails-app/controllers

Timestamp:

Jun 11, 2010, 11:44:49 AM (15 years ago)

Author:

gav

Message:

Improve work flow when working from inventoryItemPurchase search view.

File:

• trunk/grails-app/controllers/InventoryItemPurchaseDetailedController.groovy (modified) (10 diffs)

trunk/grails-app/controllers/InventoryItemPurchaseDetailedController.groovy

@@ -75 +75 @@
         }
         else {
-            params.sort = "purchaseOrderNumber"
-            params.order = "desc"
+            params.sort = "id"
+            params.order = "asc"
         }
 
         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"
@@ -175 +173 @@
     def show = {
         def inventoryItemPurchaseInstance = InventoryItemPurchase.read( params.id )
+        params.returnTo = params.returnTo ?: 'inventoryItem'
 
         if(!inventoryItemPurchaseInstance) {
@@ -188 +187 @@
         if(!result.error) {
             flash.message = g.message(code: "default.delete.success", args: ["InventoryItemPurchase", params.id])
-            redirect(controller: 'inventoryItemDetailed',
-                            action: 'show',
-                            id: result.inventoryItemId,
-                            params: [showTab: "showPurchasingTab"])
+            if(params.returnTo == 'inventoryItem') {
+                redirect(controller: 'inventoryItemDetailed',
+                                action: 'show',
+                                id: result.inventoryItemId,
+                                params: [showTab: "showPurchasingTab"])
+            }
+            else {
+                redirect(action: 'search')
+            }
             return
         }
@@ -207 +211 @@
     def edit = {
         def result = inventoryPurchaseService.edit(params)
+        params.returnTo = params.returnTo ?: 'inventoryItem'
 
         if(!result.error)
@@ -236 +241 @@
         def inventoryItemPurchaseInstance = new InventoryItemPurchase()
         inventoryItemPurchaseInstance.properties = params
+        params.returnTo = params.returnTo ?: 'inventoryItem'
 
         if(!inventoryItemPurchaseInstance.inventoryItem) {
@@ -251 +257 @@
         if(!result.error) {
             flash.message = g.message(code: "default.create.success", args: ["Inventory Purchase", ''])
-            redirect(controller: 'inventoryItemDetailed',
-                            action: 'show',
-                            id: result.inventoryItemId,
-                            params: [showTab: "showPurchasingTab"])
+            if(params.returnTo == 'inventoryItem') {
+                redirect(controller: 'inventoryItemDetailed',
+                                action: 'show',
+                                id: result.inventoryItemId,
+                                params: [showTab: "showPurchasingTab"])
+            }
+            else {
+                redirect(action: 'search')
+            }
             return
         }
@@ -271 +282 @@
 
         inventoryItemPurchaseInstance.properties = params
+        params.returnTo = params.returnTo ?: 'inventoryItem'
         def calcQuantities = inventoryPurchaseService.calcQuantities(inventoryItemPurchaseInstance)
         inventoryItemPurchaseInstance.quantity = calcQuantities.thisOrderRemaining
@@ -282 +294 @@
         if(!result.error) {
             flash.message = g.message(code: "default.create.success", args: ["Inventory Purchase", ''])
-            redirect(controller: 'inventoryItemDetailed',
-                            action: 'show',
-                            id: result.inventoryItemId,
-                            params: [showTab: "showPurchasingTab"])
+            if(params.returnTo == 'inventoryItem') {
+                redirect(controller: 'inventoryItemDetailed',
+                                action: 'show',
+                                id: result.inventoryItemId,
+                                params: [showTab: "showPurchasingTab"])
+            }
+            else {
+                redirect(action: 'search')
+            }
             return
         }
@@ -311 +328 @@
 
         inventoryItemPurchaseInstance.properties = params
+        params.returnTo = params.returnTo ?: 'inventoryItem'
         return ['inventoryItemPurchaseInstance':inventoryItemPurchaseInstance,
                         'orderId': inventoryItemPurchaseInstance.id]
@@ -320 +338 @@
         if(!result.error) {
             flash.message = g.message(code: "default.create.success", args: ["Inventory Purchase", ''])
-            redirect(controller: 'inventoryItemDetailed',
-                            action: 'show',
-                            id: result.inventoryItemId,
-                            params: [showTab: "showPurchasingTab"])
+            if(params.returnTo == 'inventoryItem') {
+                redirect(controller: 'inventoryItemDetailed',
+                                action: 'show',
+                                id: result.inventoryItemId,
+                                params: [showTab: "showPurchasingTab"])
+            }
+            else {
+                redirect(action: 'search')
+            }
             return
         }