Changeset 442 for trunk

Timestamp:

Mar 16, 2010, 12:02:09 PM (15 years ago)

Author:

gav

Message:

Small fix to inventory movement list view pagination.

Location:

trunk/grails-app

Files:

• controllers/InventoryMovementDetailedController.groovy (modified) (1 diff)
• views/inventoryMovementDetailed/listInventoryMovements.gsp (modified) (2 diffs)

trunk/grails-app/controllers/InventoryMovementDetailedController.groovy

@@ -33 +33 @@
     @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_InventoryManager', 'ROLE_InventoryUser'])
     def listInventoryMovements = {
-        def inventoryItemInstance = InventoryItem.get(params.inventoryItem.id)
+        def inventoryItemInstance
+        if(params.id)
+            inventoryItemInstance = InventoryItem.get(params.id)
+        else if(params.inventoryItem?.id)
+            inventoryItemInstance = InventoryItem.get(params.inventoryItem.id)
 
         if(!inventoryItemInstance) {
             flash.message = "Inventory item not found with id ${params.id}"
             redirect(controller:'inventoryItemDetailed', action: 'search')
+            return
         }
 

trunk/grails-app/views/inventoryMovementDetailed/listInventoryMovements.gsp

@@ -26 +26 @@
                         <tr>
                         
-                                <g:sortableColumn action="listInventoryMovements" property="quantity" title="Quantity" />
+                                <g:sortableColumn action="listInventoryMovements" property="quantity" title="Quantity" params="[id: inventoryItemInstance.id]"/>
                         
-                                <g:sortableColumn action="listInventoryMovements"  property="inventoryMovementType" title="Movement Type" />
+                                <g:sortableColumn action="listInventoryMovements"  property="inventoryMovementType" title="Movement Type" params="[id: inventoryItemInstance.id]" />
                         
-                            <g:sortableColumn action="listInventoryMovements"  property="date" title="Date" />
+                            <g:sortableColumn action="listInventoryMovements"  property="date" title="Date" params="[id: inventoryItemInstance.id]" />
                         
-                                <g:sortableColumn action="listInventoryMovements"  property="person" title="Person" />
+                                <g:sortableColumn action="listInventoryMovements"  property="person" title="Person" params="[id: inventoryItemInstance.id]" />
 
                             <th></th>
@@ -62 +62 @@
             </div>
             <div class="paginateButtons">
-                <g:paginate action="listInventoryMovements" id="${inventoryItemInstance?.id}" total="${inventoryMovementListTotal}" />
+                <g:paginate action="listInventoryMovements" id="${inventoryItemInstance.id}" total="${inventoryMovementListTotal}" />
             </div>
         </div>