Index: trunk/grails-app/views/asset/edit.gsp
===================================================================
--- trunk/grails-app/views/asset/edit.gsp (revision 269)
+++ trunk/grails-app/views/asset/edit.gsp (revision 271)
@@ -83,10 +83,10 @@
|
-
+
|
-
+ |
-
+
- ${a?.encodeAsHTML()}
Index: trunk/grails-app/views/asset/show.gsp
===================================================================
--- trunk/grails-app/views/asset/show.gsp (revision 269)
+++ trunk/grails-app/views/asset/show.gsp (revision 271)
@@ -71,9 +71,9 @@
- | Asset Sub Item: |
+ Asset Sub Items: |
-
+
- ${a?.encodeAsHTML()}
Index: trunk/grails-app/views/assetDetailed/copy.gsp
===================================================================
--- trunk/grails-app/views/assetDetailed/copy.gsp (revision 271)
+++ trunk/grails-app/views/assetDetailed/copy.gsp (revision 271)
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+ Create Asset Copy
+
+
+
+
+ Create Asset Copy
+
+
+
+ ${flash.message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
-
+
|
-
+ |
@@ -40,35 +40,8 @@
|
-
- |
-
-
-
- |
-
- |
-
-
- |
-
-
-
- |
-
- |
-
-
+
|
-
-
- |
-
- |
-
-
- |
-
-
+
|
@@ -79,5 +52,14 @@
|
-
+
+
+ |
+
+ |
+
+
+ |
+
+
Index: trunk/grails-app/views/assetDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/assetDetailed/edit.gsp (revision 269)
+++ trunk/grails-app/views/assetDetailed/edit.gsp (revision 271)
@@ -33,5 +33,5 @@
-
+
|
@@ -42,35 +42,26 @@
-
+
|
-
+
|
-
+
|
-
-
+ |
+
|
-
+
|
-
+
|
-
-
+ |
+
|
-
+
-
- |
-
- |
-
-
- |
-
-
|
@@ -91,8 +82,15 @@
|
|
-
+
|
-
-
+ |
+
+
+
+ - ${a?.encodeAsHTML()}
+
+
+Add AssetSubItem
+
|
Index: trunk/grails-app/views/assetDetailed/importAssetTree.gsp
===================================================================
--- trunk/grails-app/views/assetDetailed/importAssetTree.gsp (revision 271)
+++ trunk/grails-app/views/assetDetailed/importAssetTree.gsp (revision 271)
@@ -0,0 +1,35 @@
+
+
+
+ Import Asset Tree
+
+
+
+
+
+
Import Asset Tree
+
+
+
+
Index: trunk/grails-app/views/assetDetailed/list.gsp
===================================================================
--- trunk/grails-app/views/assetDetailed/list.gsp (revision 269)
+++ trunk/grails-app/views/assetDetailed/list.gsp (revision 271)
@@ -22,14 +22,12 @@
-
-
-
-
-
-
-
-
- |
+
+
+
+
+
+
+ Section |
@@ -40,12 +38,12 @@
${fieldValue(bean:assetInstance, field:'id')} |
-
- ${fieldValue(bean:assetInstance, field:'name')} |
-
- ${fieldValue(bean:assetInstance, field:'assetType')} |
-
- ${fieldValue(bean:assetInstance, field:'systemSection')} |
-
+
+ ${fieldValue(bean:assetInstance, field:'name')} |
+
+ ${fieldValue(bean:assetInstance, field:'description')} |
+
${fieldValue(bean:assetInstance, field:'isActive')} |
+
+ ${fieldValue(bean:assetInstance, field:'section')} |
Index: trunk/grails-app/views/assetDetailed/search.gsp
===================================================================
--- trunk/grails-app/views/assetDetailed/search.gsp (revision 269)
+++ trunk/grails-app/views/assetDetailed/search.gsp (revision 271)
@@ -8,4 +8,5 @@
+
@@ -39,10 +40,10 @@
-
-
-
+
+
+
| |
@@ -58,9 +59,9 @@
${fieldValue(bean:assetInstance, field:'name')} |
- ${fieldValue(bean:assetInstance, field:'assetType')} |
-
- ${fieldValue(bean:assetInstance, field:'systemSection')} |
+ ${fieldValue(bean:assetInstance, field:'description')} |
${fieldValue(bean:assetInstance, field:'isActive')} |
+
+ ${fieldValue(bean:assetInstance, field:'section')} |
@@ -78,4 +79,18 @@
+
+
+ Asset Tree:
+
+ Export
+
+ /
+
+ Template
+
+ /
+
+ Import
+
+ associatedProperties="section.name"
+ filterPropertyValues="${['section.name':[values:Section.list()] ]}" />
Index: trunk/grails-app/views/assetDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/assetDetailed/show.gsp (revision 269)
+++ trunk/grails-app/views/assetDetailed/show.gsp (revision 271)
@@ -19,5 +19,4 @@
-
@@ -29,8 +28,55 @@
- | Name: |
-
- ${fieldValue(bean:assetInstance, field:'name')} |
-
+ Asset: |
+
+
+ ${assetInstance.encodeAsHTML()}
+
+ } "Add Sub Item")
+
+
+ } "Copy Asset")
+
+
+
+
+
+ -
+ ${assetSubItem1?.encodeAsHTML()}
+
+
+
+
+
+
+ -
+ ${assetSubItem2?.encodeAsHTML()}
+
+
+
+
+
+
+ -
+ ${assetSubItem3?.encodeAsHTML()}
+
+
+
+
+
+
+ - ${assetSubItem4?.encodeAsHTML()}
+
+
+
+
+
+
+
+
+
+
+ |
+
@@ -39,52 +85,4 @@
${fieldValue(bean:assetInstance, field:'description')} |
-
-
-
-
- | Cost Code: |
-
- ${fieldValue(bean:assetInstance, field:'costCode')} |
-
-
-
-
- | Asset Type: |
-
-
- ${assetInstance?.assetType?.encodeAsHTML()}
-
-
- -
- ${a?.encodeAsHTML()}
-
-
- - ${s?.encodeAsHTML()}
-
-
-
-
-
- |
-
-
-
-
- | System Section: |
-
- ${assetInstance?.systemSection?.encodeAsHTML()} |
-
-
-
-
- | Asset Extended Attributes: |
-
-
-
-
- - ${a?.encodeAsHTML()}
-
-
- |
@@ -98,4 +96,24 @@
+ | Section: |
+
+ ${assetInstance?.section?.encodeAsHTML()} |
+
+
+
+
+ | Asset Extended Attributes: |
+
+
+
+
+ - ${a?.encodeAsHTML()}
+
+
+ |
+
+
+
+
| Maintenance Actions: |
@@ -103,5 +121,5 @@
- - ${m?.encodeAsHTML()}
+ - ${m?.encodeAsHTML()}
|