Ignore:
Timestamp:
May 1, 2011, 12:46:31 PM (8 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/_taskProcedure.gsp

    r809 r913  
    2727                <td valign="top" class="name">Linked Asset:</td>
    2828                <td valign="top" class="value">
    29                     <g:render template="/shared/assetTreeCompact" model="['assetInstance': taskProcedureInstance.linkedTask.primaryAsset]" />
     29                    <g:include controller="assetDetailed" action="assetTreeCompact" id="${taskProcedureInstance.linkedTask.primaryAsset.id}" />
    3030                </td>
    3131            </tr>
Note: See TracChangeset for help on using the changeset viewer.