Changeset 1274
- Timestamp:
- Dec 15, 2010, 1:53:28 PM (12 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/controllers/dbnp/studycapturing/TemplateController.groovy
r1273 r1274 79 79 templates << templateData 80 80 } catch (Exception e) { 81 templates << [ template: null, error: "Template " + ( template.name ?: " without name" ) + " could not be parsed: " + e + " (" + e.getStackTrace()[ 0 ] + "; " + e.getStackTrace()[ 1 ] + "; " + e.getStackTrace()[ 2 ] + ")"];81 templates << [ template: null, error: "Template " + ( template.name ?: " without name" ) + " could not be parsed: " + e ]; 82 82 } 83 83 } -
trunk/grails-app/domain/dbnp/studycapturing/TemplateField.groovy
r1272 r1274 378 378 return false 379 379 380 if( otherObject == null ) 381 return false 382 380 383 TemplateField otherField = (TemplateField) otherObject; 381 384 382 385 if( otherField == this ) 383 386 return true 384 385 if( otherField == null )386 return false387 387 388 388 if( otherField.entity != this.entity ) { … … 417 417 def entryFound = false; 418 418 for( def otherEntry in otherField.listEntries ) { 419 if( otherEntry.name == entry.name ) { 419 def name1 = entry != null ? entry.name : "" 420 def name2 = otherEntry != null ? otherEntry.name : "" 421 if( name1 == name2 ) { 420 422 entryFound = true; 421 423 break
Note: See TracChangeset
for help on using the changeset viewer.