Ignore:
Timestamp:
May 1, 2011, 12:46:31 PM (14 years ago)
Author:
gav
Message:

Svn merge -r875:r911 branches/features/grailsUpgrade/ into trunk/.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/grails-app/views/taskProcedureDetailed/_taskProcedureRevision.gsp

    r854 r913  
    2525                        <td valign="top" class="name">Linked Asset:</td>
    2626                        <td valign="top" class="value">
    27                             <g:render template="/shared/assetTreeCompact" model="['assetInstance': taskProcedureRevision.linkedTask.primaryAsset]" />
     27                            <g:include controller="assetDetailed" action="assetTreeCompact" id="${taskProcedureRevision.linkedTask.primaryAsset.id}" />
     28
    2829                        </td>
    2930                    </tr>
Note: See TracChangeset for help on using the changeset viewer.