Changeset 370


Ignore:
Timestamp:
Feb 17, 2010, 10:46:57 PM (10 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/views/assetDetailed/edit.gsp

    r349 r370  
    124124                <div class="buttons">
    125125                    <span class="button"><g:actionSubmit class="save" value="Update" /></span>
     126                    <span class="button"><g:actionSubmit class="cancel" value="Cancel" action="Show"/></span>
    126127                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
    127128                </div>
  • trunk/grails-app/views/assetDetailed/show.gsp

    r349 r370  
    8181                                    <ul>
    8282                                    <g:each var="m" in="${assetInstance.maintenanceActions}">
    83                                         <li><g:link controller="maintenanceActionDetailed" action="edit" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
     83                                        <li><g:link controller="maintenanceActionDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
    8484                                    </g:each>
    8585                                    </ul>
  • trunk/grails-app/views/shared/_assetTree.gsp

    r304 r370  
    1616                                                return false">
    1717            </a>
    18             <g:link controller="assetSubItemDetailed" action="edit" id="${assetSubItem1.id}">${assetSubItem1?.encodeAsHTML()}</g:link>
     18            <g:link controller="assetSubItemDetailed" action="show" id="${assetSubItem1.id}">${assetSubItem1?.encodeAsHTML()}</g:link>
    1919            <g:link controller="assetSubItemDetailed" params="['parentItem.id':assetSubItem1?.id]" action="create">
    2020                <img src="${resource(dir:'images/skin',file:'database_add.png')}" alt="Add" title="Add Sub Item" />
     
    2929                    <a href='' class="toggle">
    3030                    </a>
    31                     <g:link controller="assetSubItemDetailed" action="edit" id="${assetSubItem2.id}">${assetSubItem2?.encodeAsHTML()}</g:link>
     31                    <g:link controller="assetSubItemDetailed" action="show" id="${assetSubItem2.id}">${assetSubItem2?.encodeAsHTML()}</g:link>
    3232                    <g:link controller="assetSubItemDetailed" params="['parentItem.id':assetSubItem2?.id]" action="create">
    3333                        <img src="${resource(dir:'images/skin',file:'database_add.png')}" alt="Add" title="Add Sub Item" />
     
    3737                <g:each var="assetSubItem3" in="${assetSubItem2.subItems.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }">
    3838                    <li>
    39                         <g:link controller="assetSubItemDetailed" action="edit" id="${assetSubItem3.id}">${assetSubItem3?.encodeAsHTML()}</g:link>
     39                        <g:link controller="assetSubItemDetailed" action="show" id="${assetSubItem3.id}">${assetSubItem3?.encodeAsHTML()}</g:link>
    4040                        <g:link controller="assetSubItemDetailed" params="['parentItem.id':assetSubItem3?.id]" action="create">
    4141                            <img src="${resource(dir:'images/skin',file:'database_add.png')}" alt="Add" title="Add Sub Item" />
     
    4444                    <ul>
    4545                    <g:each var="assetSubItem4" in="${assetSubItem3.subItems.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }">
    46                         <li><g:link controller="assetSubItemDetailed" action="edit" id="${assetSubItem4.id}">${assetSubItem4?.encodeAsHTML()}</g:link></li>
     46                        <li><g:link controller="assetSubItemDetailed" action="show" id="${assetSubItem4.id}">${assetSubItem4?.encodeAsHTML()}</g:link></li>
    4747                    </g:each> <!--assetSubItem4-->
    4848                    </ul>
Note: See TracChangeset for help on using the changeset viewer.