Changeset 1270

Timestamp:

Dec 15, 2010, 1:32:02 PM (11 years ago)

Author:

robert@…

Message:

Bugfix in importing templates (ticket #76)

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/TemplateController.groovy (modified) (1 diff)
• domain/dbnp/studycapturing/TemplateField.groovy (modified) (1 diff)
• views/template/xml.gsp (modified) (1 diff)

trunk/grails-app/controllers/dbnp/studycapturing/TemplateController.groovy

@@ -79 +79 @@
                                 templates << templateData
                         } catch (Exception e) {
-                                templates << [ template: null, error: "Template " + ( template.name ?: " without name" ) + " could not be parsed"];
+                                templates << [ template: null, error: "Template " + ( template.name ?: " without name" ) + " could not be parsed: " + e ];
                         }
                 }

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

@@ -474 +474 @@
                 // Search for list entries
                 xmlObject.listItems?.listItem.each {
-                        t.addToListEntries( new TemplateFieldListItem( name: it.name?.text() ) );
+                        def name = ""
+                        if( it.name )
+                                name = it.name.text()
+
+                        t.addToListEntries( new TemplateFieldListItem( name: name ) );
                 }
                 return t;

trunk/grails-app/views/template/xml.gsp

@@ -35 +35 @@
                                         <g:each in="${field.listEntries}" var="listEntry">
                                           <listItem>
-                                                  <name><g:if test="${listEntry}">${listEntry.name?.encodeAsSimpleXML()}</g:if></name>
+                                                  <g:if test="${listEntry}"><name>${listEntry.name?.encodeAsSimpleXML()}</name></g:if>
                                           </listItem>
                                         </g:each>