Changeset 847


Ignore:
Timestamp:
Aug 27, 2010, 2:26:09 PM (8 years ago)
Author:
duh
Message:
  • fixed null object issue in TemplateEntity?
  • event group tooltip only contained events, not sampling events
Location:
trunk/grails-app
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/domain/dbnp/studycapturing/TemplateEntity.groovy

    r825 r847  
    749749         */
    750750        static Collection<Template> giveTemplates(Collection<TemplateEntity> entityCollection) {
    751                 def set = entityCollection*.template.unique();
     751                def set = entityCollection*.template?.unique();
    752752
    753753                // If one or more entities does not have a template, the resulting
  • trunk/grails-app/views/wizard/pages/_groups.gsp

    r778 r847  
    3333                                        <div class="helpContent">
    3434                                                <h1>${eventGroup.name}</h1>
    35                                                 <g:each var="event" status="e" in="${eventGroup.events}">
     35                                                <g:each var="event" status="e" in="${(eventGroup.events + eventGroup.samplingEvents)}">
    3636                                                        <h2>${event.template}</h2>
    3737                                                        <g:each var="field" status="f" in="${event.giveFields()}">
Note: See TracChangeset for help on using the changeset viewer.