Changeset 896

Timestamp:

Sep 20, 2010, 5:17:37 PM (13 years ago)

Author:

keesvb

Message:

the workaround for checking Template name uniqueness actually broke the template editor, it doesn't work for validating existing Template objects. Deleted for now, and added validate to Template editor.

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/TemplateEditorController.groovy (modified) (1 diff)
• domain/dbnp/studycapturing/Template.groovy (modified) (1 diff)

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

@@ -503 +503 @@
                         template.fields.add( Integer.parseInt( params.position ), templateField )
                 }
-                template.save(flush:true);
+
+            if (!template.validate()) {
+                    response.status = 500;
+                    template.errors.each { render it}
+            }
+            template.save(flush:true);
 
                 def html = g.render( template: 'elements/selected', model: [templateField: templateField, template: template, ontologies: Ontology.list(), fieldTypes: TemplateFieldType.list()] );

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

@@ -73 +73 @@
                 // which can co-exist with the same name. See also TemplateField
                 // name(unique:['entity'])
-                // workaround:
-                name(validator: { value, obj, errors ->
-                        // 'obj' refers to the actual Template object
-
-                        // define a boolean
-                        boolean error = false
-
-                        if (value && obj.entity) {
-
-                                // gather all Cars with this particular model
-                                def entityTemplates = Template.findAllByEntity(obj.entity)
-
-                                // check if there is already a Template object with this name in that collection
-                                if (entityTemplates.findAll{it.name.equals(value)}.size() > 0) {
-                                        errors.rejectValue(
-                                                'name',
-                                                'template.UniqueNameViolation',
-                                                [value, obj.entity] as Object[],
-                                                'There already exists a template named {0} for entity {1}'
-                                        )
-                                        error = true
-                                }
-                        }
-                        else {
-                                // if there is no name or model defined, fail immediately
-                                error = true
-                        }
-                        // got an error, or not?
-                        if (error) return false
-                })
 
         }