Changeset 847

Timestamp:

Aug 27, 2010, 2:26:09 PM (12 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:

• domain/dbnp/studycapturing/TemplateEntity.groovy (modified) (1 diff)
• views/wizard/pages/_groups.gsp (modified) (1 diff)

trunk/grails-app/domain/dbnp/studycapturing/TemplateEntity.groovy

@@ -749 +749 @@
          */
         static Collection<Template> giveTemplates(Collection<TemplateEntity> entityCollection) {
-                def set = entityCollection*.template.unique();
+                def set = entityCollection*.template?.unique();
 
                 // If one or more entities does not have a template, the resulting

trunk/grails-app/views/wizard/pages/_groups.gsp

@@ -33 +33 @@
                                         <div class="helpContent">
                                                 <h1>${eventGroup.name}</h1>
-                                                <g:each var="event" status="e" in="${eventGroup.events}">
+                                                <g:each var="event" status="e" in="${(eventGroup.events + eventGroup.samplingEvents)}">
                                                         <h2>${event.template}</h2>
                                                         <g:each var="field" status="f" in="${event.giveFields()}">