Changeset 633 for trunk/grails-app/views/inventoryItemPurchaseDetailed

Timestamp:

Jul 19, 2010, 8:47:38 AM (15 years ago)

Author:

gav

Message:

Domain change: Add PurchasingGroup?.
Logic and views to suite.

Location:

trunk/grails-app/views/inventoryItemPurchaseDetailed

Files:

• create.gsp (modified) (2 diffs)
• edit.gsp (modified) (3 diffs)

trunk/grails-app/views/inventoryItemPurchaseDetailed/create.gsp

@@ -15 +15 @@
         <div class="body">
             <g:render template="/shared/messages" />
+            <g:if test="${!costCodes}" >
+                <div class="errors">
+                    <ul>
+                        <li><g:message code="inventoryItemPurchase.costCodes.not.found" /><li>
+                </div>
+            </g:if>
             <g:hasErrors bean="${inventoryItemPurchaseInstance}">
             <div class="errors">
@@ -66 +72 @@
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'costCode','errors')}">
                                     <g:select optionKey="id"
-                                                        from="${ CostCode.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }"
+                                                        from="${ costCodes }"
                                                         name="costCode.id"
                                                         value="${inventoryItemPurchaseInstance?.costCode?.id}"

trunk/grails-app/views/inventoryItemPurchaseDetailed/edit.gsp

@@ -59 +59 @@
                                 </td>
                             </tr> 
-                        
+
                             <tr class="prop">
                                 <td valign="top" class="name">
@@ -65 +65 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'costCode','errors')}">
-                                    <g:select optionKey="id"
-                                                        from="${ CostCode.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }"
-                                                        name="costCode.id"
-                                                        value="${inventoryItemPurchaseInstance?.costCode?.id}" >
-                                    </g:select>
+                                    <g:if test="${costCodes}">
+                                        <g:select optionKey="id"
+                                                            from="${ costCodes }"
+                                                            name="costCode.id"
+                                                            value="${inventoryItemPurchaseInstance.costCode?.id}" >
+                                        </g:select>
+                                    </g:if>
+                                    <g:else>
+                                        <g:link controller="costCodeDetailed" action="show" id="${inventoryItemPurchaseInstance?.costCode?.id}">
+                                            ${inventoryItemPurchaseInstance?.costCode?.encodeAsHTML()}
+                                        </g:link>
+                                    </g:else>
                                     <g:helpBalloon code="inventoryItemPurchase.cost.code" />
                                 </td>
@@ -96 +103 @@
                                                         from="${ Supplier.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }"
                                                         name="supplier.id"
-                                                        value="${inventoryItemPurchaseInstance?.supplier?.id}"
-                                                        noSelection="['null':/${g.message(code:'default.please.select.text')}/]">
+                                                        value="${inventoryItemPurchaseInstance?.supplier?.id}">
                                     </g:select>
                                     <g:helpBalloon code="inventoryItemPurchase.supplier" />