Changeset 453 for trunk/grails-app/controllers

Timestamp:

Mar 25, 2010, 3:37:34 AM (15 years ago)

Author:

gav

Message:

Improvements to use inventory item flow and logic and added a clear function.
Rename CSS tree_pane_close to the more re-useable pane_close.

File:

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

trunk/grails-app/controllers/InventoryItemDetailedController.groovy

@@ -232 +232 @@
         flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
         redirect(action:search)
-        return
     }
 
@@ -344 +343 @@
         if(!result.error) {
             flash.message = "Inventory Movement for ${result.inventoryMovementInstance.inventoryItem.name.encodeAsHTML()} created."
-            redirect(controller:"taskDetailed", action:"show", id: result.taskId)
-        }
-        else {
-            if(result.inventoryMovementInstance) {
-                def p = [:]
-                p.id = result.inventoryMovementInstance.inventoryItem?.id
-                def r = inventoryItemService.show(p)
-
-                def model = [ inventoryItemInstance: r.inventoryItemInstance,
-                                        inventoryMovementList: r.inventoryMovementList,
-                                        inventoryMovementListTotal: r.inventoryMovementListTotal,
-                                        inventoryMovementListMax: r.inventoryMovementListMax,
-                                        showTab: r.showTab]
-
-                model.inventoryMovementInstance = result.inventoryMovementInstance
-
-                render(view: 'show', model: model)
-            }
-            else {
-                flash.message = "Could not create inventory movement."
-                redirect(action:"search")
-            }
-
-        }
-    }
-
-}
+            session.inventoryMovementTaskId = null
+            redirect(controller: "taskDetailed",
+                            action: "show",
+                            id: result.taskId,
+                            params: [showTab: "showInventoryTab"])
+            // Success.
+            return
+        }
+
+        // Prepare data for the show view.
+        def p = [:]
+        p.id = result.inventoryMovementInstance.inventoryItem?.id
+        def r = inventoryItemService.show(p)
+
+        // Render show view if data was successfully prepared.
+        if(!r.error) {
+            def model = [ inventoryItemInstance: r.inventoryItemInstance,
+                                    inventoryMovementList: r.inventoryMovementList,
+                                    inventoryMovementListTotal: r.inventoryMovementListTotal,
+                                    inventoryMovementListMax: r.inventoryMovementListMax,
+                                    inventoryItemPurchases: r.inventoryItemPurchases,
+                                    inventoryItemPurchasesTotal: r.inventoryItemPurchasesTotal,
+                                    showTab: r.showTab]
+
+            model.inventoryMovementInstance = result.inventoryMovementInstance // This will pass in the errors.
+
+            render(view: 'show', model: model)
+            return
+        }
+
+        // Could not prepare data for show view so doing the next best thing.
+        flash.errorMessage = g.message(code: r.error.code, args: r.error.args)
+        redirect(action:search)
+
+    } // useInventoryItem
+
+    /**
+    * Clear the use inventory item form in the show view.
+    * Accomplished by clearing the session variable and ajax.
+    */
+    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_InventoryManager', 'ROLE_InventoryUser'])
+    def clearUseInventoryItem = {
+            session.inventoryMovementTaskId = null
+            render ''
+    }
+
+} // end of class