Changeset 1274

Timestamp:

Dec 15, 2010, 1:53:28 PM (7 years ago)

Author:

robert@…

Message:

Trying to solve a bug that only appears on ci, not locally, in importing templates (ticket #76)

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/TemplateController.groovy (modified) (1 diff)
• domain/dbnp/studycapturing/TemplateField.groovy (modified) (2 diffs)

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: " + e + " (" + e.getStackTrace()[ 0 ] + "; " + e.getStackTrace()[ 1 ] + "; " + e.getStackTrace()[ 2 ] + ")" ];
+                                templates << [ template: null, error: "Template " + ( template.name ?: " without name" ) + " could not be parsed: " + e ];
                         }
                 }

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

@@ -378 +378 @@
                         return false
 
+                if( otherObject == null )
+                        return false
+
                 TemplateField otherField = (TemplateField) otherObject;
 
                 if( otherField == this )
                         return true
-
-                if( otherField == null )
-                        return false
 
                 if( otherField.entity != this.entity ) {
@@ -417 +417 @@
                                 def entryFound = false;
                                 for( def otherEntry in otherField.listEntries ) {
-                                        if( otherEntry.name == entry.name ) {
+                                        def name1 = entry != null ? entry.name : ""
+                                        def name2 = otherEntry != null ? otherEntry.name : ""
+                                        if( name1 == name2 ) {
                                                 entryFound = true;
                                                 break