Changeset 838 for trunk/grails-app/views/entryDetailed/_create.gsp

Timestamp:

Mar 3, 2011, 11:17:40 PM (14 years ago)

Author:

gav

Message:

Update service, controller and view logic to hand Task and Entry highestSeverity.
Also remove associatedAssets from task search panes.

File:

• trunk/grails-app/views/entryDetailed/_create.gsp (modified) (2 diffs)

trunk/grails-app/views/entryDetailed/_create.gsp

@@ -16 +16 @@
             <table>
                 <tbody>
+
+                    <g:if test="${entryInstance?.entryType?.id == 1}">
+                        <tr class="prop">
+                            <td valign="top" class="name">
+                                <label for="productionReference">Production:</label>
+                            </td>
+                            <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'productionReference','errors')}">
+                                <g:select optionKey="id"
+                                                    from="${ProductionReference.findAllByIsActive(true)}"
+                                                    name="productionReference.id"
+                                                    value="${entryInstance.productionReference?.id}"
+                                                    noSelection="['null':'--None--']">
+                                </g:select>
+                                <custom:helpBalloon code="entry.productionReference.fault" iconSrc="${resource(plugin:'help-balloons', dir:'images', file:'balloon-icon.gif')}" />
+                            </td>
+                        </tr>
+                    </g:if>
+
+                    <g:if test="${entryInstance?.entryType?.id == 6}">
+                        <tr class="prop">
+                            <td valign="top" class="name">
+                                <label for="highestSeverity">Condition Severity:</label>
+                            </td>
+                            <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'highestSeverity','errors')}">
+                                <g:select optionKey="id"
+                                                    from="${ConditionSeverity.findAllByIsActive(true)}"
+                                                    name="highestSeverity.id"
+                                                    value="${entryInstance.highestSeverity?.id}"
+                                                    noSelection="['null':/${g.message(code:'default.please.select.text')}/]" >
+                                </g:select>
+                                <custom:helpBalloon code="entry.comment.pm.entry" iconSrc="${resource(plugin:'help-balloons', dir:'images', file:'balloon-icon.gif')}" />
+                            </td>
+                        </tr>
+                    </g:if>
 
                     <tr class="prop">
@@ -48 +82 @@
                     </tr>
 
-                    <g:if test="${entryInstance?.entryType?.id == 1}">
-                        <tr class="prop">
-                            <td valign="top" class="name">
-                                <label for="productionReference">Production:</label>
-                            </td>
-                            <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'productionReference','errors')}">
-                                <g:select optionKey="id"
-                                                    from="${ProductionReference.findAllByIsActive(true)}"
-                                                    name="productionReference.id"
-                                                    value="${entryInstance.productionReference?.id}"
-                                                    noSelection="['null':'--None--']">
-                                </g:select>
-                                <custom:helpBalloon code="entry.productionReference.fault" iconSrc="${resource(plugin:'help-balloons', dir:'images', file:'balloon-icon.gif')}" />
-                            </td>
-                        </tr>
-                    </g:if>
-
                     <g:if test="${entryInstance?.entryType?.id != 2}">
                         <tr class="prop">