Changeset 584


Ignore:
Timestamp:
Jun 8, 2010, 6:16:08 PM (14 years ago)
Author:
gav
Message:

Add red banner for obsolete and not active inventory items, as per ticket #69.

Location:
trunk/grails-app
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/i18n/messages.properties

    r565 r584  
    154154task.associatedAssets.help=These assets are to be associated with this task, but costs will not be assigned.
    155155
     156inventory.item.is.obsolete=This item has been flagged as obsolete.
     157inventory.item.not.active=This item has been flagged as not active.
    156158inventory.item.already.has.picture=Inventory item already has a picture, please delete the old picture first.
    157159inventory.item.picture.file.unrecognised=Image file [{0}]: type not recognised.
  • trunk/grails-app/views/inventoryItemDetailed/show.gsp

    r575 r584  
    1616        <div class="body">
    1717            <g:render template="/shared/messages" />
     18            <g:if test="${inventoryItemInstance.isObsolete || !inventoryItemInstance.isActive}" >
     19                <div class="errors">
     20                    <ul>
     21                        <g:if test="${inventoryItemInstance.isObsolete}" >
     22                            <li><g:message code="inventory.item.is.obsolete" /><li>
     23                        </g:if>
     24                        <g:if test="${!inventoryItemInstance.isActive}" >
     25                            <li><g:message code="inventory.item.not.active" /><li>
     26                        </g:if>
     27                    <ul>
     28                </div>
     29            </g:if>
    1830            <g:hasErrors bean="${inventoryMovementInstance}">
    1931                <div class="errors">
Note: See TracChangeset for help on using the changeset viewer.