Changeset 388 for trunk/grails-app/views/assetSubItemDetailed
- Timestamp:
- Feb 18, 2010, 8:12:03 PM (15 years ago)
- Location:
- trunk/grails-app/views/assetSubItemDetailed
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/views/assetSubItemDetailed/edit.gsp
r369 r388 64 64 <tr class="prop"> 65 65 <td valign="top" class="name"> 66 <label for="assetSubItemExtendedAttributes"> Asset Sub ItemExtended Attributes:</label>66 <label for="assetSubItemExtendedAttributes">Extended Attributes:</label> 67 67 </td> 68 68 <td valign="top" class="value ${hasErrors(bean:assetSubItemInstance,field:'assetSubItemExtendedAttributes','errors')}"> … … 73 73 </g:each> 74 74 </ul> 75 <g:link controller="assetSubItemExtendedAttributeDetailed" params="['assetSubItem.id':assetSubItemInstance?.id]" action="create">Add AssetSubItemExtendedAttribute</g:link>75 <g:link controller="assetSubItemExtendedAttributeDetailed" params="['assetSubItem.id':assetSubItemInstance?.id]" action="create">Add Extended Attribute</g:link> 76 76 77 77 </td> … … 79 79 80 80 <tr class="prop"> 81 82 <tr class="prop">83 <td valign="top" class="name">84 <label for="maintenanceActions">Maintenance Actions:</label>85 </td>86 <td valign="top" class="value ${hasErrors(bean:assetSubItemInstance,field:'maintenanceActions','errors')}">87 88 <ul>89 <g:each var="m" in="${assetSubItemInstance?.maintenanceActions?}">90 <li><g:link controller="maintenanceActionDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>91 </g:each>92 </ul>93 <g:link controller="maintenanceActionDetailed" params="['assetSubItem.id':assetSubItemInstance?.id]" action="create">Add MaintenanceAction</g:link>94 95 </td>96 </tr>97 98 81 99 82 <tr class="prop"> … … 120 103 <g:else> 121 104 <ul> 122 <g:each var="a" in="${ assetSubItemInstance.assets}">105 <g:each var="a" in="${ assetSubItemInstance.assets.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }"> 123 106 <li><g:link controller="assetDetailed" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li> 124 107 </g:each> … … 140 123 </g:each> 141 124 </ul> 142 <g:link controller="assetSubItemDetailed" params="['parentItem.id':assetSubItemInstance?.id]" action="create">Add AssetSubItem</g:link>125 <g:link controller="assetSubItemDetailed" params="['parentItem.id':assetSubItemInstance?.id]" action="create">Add Sub Item</g:link> 143 126 144 127 </td> 145 128 </tr> 129 130 <tr class="prop"> 131 <td valign="top" class="name"> 132 <label for="maintenanceActions">Maintenance Actions:</label> 133 </td> 134 <td valign="top" class="value ${hasErrors(bean:assetSubItemInstance,field:'maintenanceActions','errors')}"> 135 136 <ul> 137 <g:each var="m" in="${assetSubItemInstance?.maintenanceActions?}"> 138 <li><g:link controller="maintenanceActionDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li> 139 </g:each> 140 </ul> 141 <g:link controller="maintenanceActionDetailed" params="['assetSubItem.id':assetSubItemInstance?.id]" action="create">Add Maintenance Action</g:link> 142 143 </td> 144 </tr> 146 145 147 146 </tbody> -
trunk/grails-app/views/assetSubItemDetailed/show.gsp
r369 r388 55 55 56 56 <tr class="prop"> 57 <td valign="top" class="name"> Asset Sub ItemExtended Attributes:</td>57 <td valign="top" class="name">Extended Attributes:</td> 58 58 59 59 <td valign="top" style="text-align:left;" class="value"> … … 61 61 <g:each var="a" in="${assetSubItemInstance.assetSubItemExtendedAttributes}"> 62 62 <li><g:link controller="assetSubItemExtendedAttributeDetailed" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li> 63 </g:each> 64 </ul> 65 </td> 66 67 </tr> 68 69 <tr class="prop"> 70 <td valign="top" class="name">Parent Item:</td> 71 72 <td valign="top" class="value"> 73 <g:if test="${assetSubItemInstance.assets}"> 74 Assigned to assets. 75 </g:if> 76 <g:else> 77 <g:link controller="assetSubItemDetailed" action="show" id="${assetSubItemInstance?.parentItem?.id}"> 78 ${assetSubItemInstance?.parentItem?.encodeAsHTML()} 79 </g:link> 80 </g:else> 81 </td> 82 83 </tr> 84 85 <tr class="prop"> 86 <td valign="top" class="name">Assets:</td> 87 88 <td valign="top" style="text-align:left;" class="value"> 89 <g:if test="${assetSubItemInstance.parentItem}" > 90 Assigned to parent item. 91 </g:if> 92 <g:else> 93 <ul> 94 <g:each var="a" in="${ assetSubItemInstance.assets.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }"> 95 <li><g:link controller="assetDetailed" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li> 96 </g:each> 97 </ul> 98 </g:else> 99 </td> 100 101 </tr> 102 103 <tr class="prop"> 104 <td valign="top" class="name">Sub Items:</td> 105 106 <td valign="top" style="text-align:left;" class="value"> 107 <ul> 108 <g:each var="s" in="${assetSubItemInstance.subItems}"> 109 <li><g:link controller="assetSubItemDetailed" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li> 63 110 </g:each> 64 111 </ul> … … 80 127 </tr> 81 128 82 <tr class="prop">83 <td valign="top" class="name">Parent Item:</td>84 85 <td valign="top" class="value"><g:link controller="assetSubItemDetailed" action="show" id="${assetSubItemInstance?.parentItem?.id}">${assetSubItemInstance?.parentItem?.encodeAsHTML()}</g:link></td>86 87 </tr>88 89 <tr class="prop">90 <td valign="top" class="name">Assets:</td>91 92 <td valign="top" style="text-align:left;" class="value">93 <ul>94 <g:each var="a" in="${assetSubItemInstance.assets}">95 <li><g:link controller="assetDetailed" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>96 </g:each>97 </ul>98 </td>99 100 </tr>101 102 <tr class="prop">103 <td valign="top" class="name">Sub Items:</td>104 105 <td valign="top" style="text-align:left;" class="value">106 <ul>107 <g:each var="s" in="${assetSubItemInstance.subItems}">108 <li><g:link controller="assetSubItemDetailed" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>109 </g:each>110 </ul>111 </td>112 113 </tr>114 115 129 </tbody> 116 130 </table>
Note: See TracChangeset
for help on using the changeset viewer.
