Changeset 370 for trunk

Timestamp:

Feb 17, 2010, 10:46:57 PM (15 years ago)

Author:

gav

Message:

Add cancel button to AssetDetailed edit view and change some of the edit links to show links.

Location:

trunk/grails-app/views

Files:

• assetDetailed/edit.gsp (modified) (1 diff)
• assetDetailed/show.gsp (modified) (1 diff)
• shared/_assetTree.gsp (modified) (4 diffs)

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

@@ -124 +124 @@
                 <div class="buttons">
                     <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                    <span class="button"><g:actionSubmit class="cancel" value="Cancel" action="Show"/></span>
                     <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
                 </div>

trunk/grails-app/views/assetDetailed/show.gsp

@@ -81 +81 @@
                                     <ul>
                                     <g:each var="m" in="${assetInstance.maintenanceActions}">
-                                        <li><g:link controller="maintenanceActionDetailed" action="edit" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+                                        <li><g:link controller="maintenanceActionDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
                                     </g:each>
                                     </ul>

trunk/grails-app/views/shared/_assetTree.gsp

@@ -16 +16 @@
                                                 return false">
             </a>
-            <g:link controller="assetSubItemDetailed" action="edit" id="${assetSubItem1.id}">${assetSubItem1?.encodeAsHTML()}</g:link>
+            <g:link controller="assetSubItemDetailed" action="show" id="${assetSubItem1.id}">${assetSubItem1?.encodeAsHTML()}</g:link>
             <g:link controller="assetSubItemDetailed" params="['parentItem.id':assetSubItem1?.id]" action="create">
                 <img src="${resource(dir:'images/skin',file:'database_add.png')}" alt="Add" title="Add Sub Item" />
@@ -29 +29 @@
                     <a href='' class="toggle">
                     </a>
-                    <g:link controller="assetSubItemDetailed" action="edit" id="${assetSubItem2.id}">${assetSubItem2?.encodeAsHTML()}</g:link>
+                    <g:link controller="assetSubItemDetailed" action="show" id="${assetSubItem2.id}">${assetSubItem2?.encodeAsHTML()}</g:link>
                     <g:link controller="assetSubItemDetailed" params="['parentItem.id':assetSubItem2?.id]" action="create">
                         <img src="${resource(dir:'images/skin',file:'database_add.png')}" alt="Add" title="Add Sub Item" />
@@ -37 +37 @@
                 <g:each var="assetSubItem3" in="${assetSubItem2.subItems.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }">
                     <li>
-                        <g:link controller="assetSubItemDetailed" action="edit" id="${assetSubItem3.id}">${assetSubItem3?.encodeAsHTML()}</g:link>
+                        <g:link controller="assetSubItemDetailed" action="show" id="${assetSubItem3.id}">${assetSubItem3?.encodeAsHTML()}</g:link>
                         <g:link controller="assetSubItemDetailed" params="['parentItem.id':assetSubItem3?.id]" action="create">
                             <img src="${resource(dir:'images/skin',file:'database_add.png')}" alt="Add" title="Add Sub Item" />
@@ -44 +44 @@
                     <ul>
                     <g:each var="assetSubItem4" in="${assetSubItem3.subItems.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }">
-                        <li><g:link controller="assetSubItemDetailed" action="edit" id="${assetSubItem4.id}">${assetSubItem4?.encodeAsHTML()}</g:link></li>
+                        <li><g:link controller="assetSubItemDetailed" action="show" id="${assetSubItem4.id}">${assetSubItem4?.encodeAsHTML()}</g:link></li>
                     </g:each> <!--assetSubItem4-->
                     </ul>