Changeset 1556
- Timestamp:
- Feb 24, 2011, 1:38:17 PM (12 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy
r1555 r1556 260 260 // Grom a development message 261 261 if (pluginManager.getGrailsPlugin('grom')) ".persisting instances to the database...".grom() 262 263 if (saveEntities(flow, params)) { 264 //if (ImporterService.saveDatamatrix(flow.importer_study, flow.importer_importeddata)) { 265 //log.error ".import wizard succesfully persisted all entities" 266 //def session = sessionFactory.getCurrentSession()267 //session.clear() 262 263 // Always delete the uploaded file in the save step to be sure it doesn't reside there anymore 264 fileService.delete(flow.importer_importedfile) 265 266 // Save all entities 267 if (saveEntities(flow, params)) { 268 268 success() 269 269 } else { … … 334 334 * @returns boolean true if correctly validated, otherwise false 335 335 */ 336 boolean fileImportPage(flow, flash, params) { 336 boolean fileImportPage(flow, flash, params) { 337 337 def importedfile = fileService.get(params['importfile']) 338 //fileService.delete(YourFile) 338 flow.importer_importedfile = params['importfile'] 339 339 340 340 if (importedfile.exists()) { … … 371 371 flow.importer_headerrow = params.headerrow.toInteger() 372 372 flow.importer_entityclass = entityClass 373 373 flow.importer_entity = GdtService.cachedEntities.find{ it.entity==entityName } 374 374 375 // Get the header from the Excel file using the arguments given in the first step of the wizard 375 376 flow.importer_header = ImporterService.getHeader(session.importer_workbook, … … 528 529 529 530 // loop through all entities to validate them and add them to wizardErrors flash when invalid 530 table.each { record ->531 /*table.each { record -> 531 532 record.each { entity -> 532 533 if (!entity.validate()) { … … 534 535 } 535 536 } 536 } 537 }*/ 537 538 538 539 flow.importer_failedcells = failedcells -
trunk/grails-app/views/importer/common/_properties_horizontal.gsp
r1555 r1556 16 16 17 17 18 <!-- saveproperties action was defined in the form --> 19 ${mappingname} 20 18 <!-- saveproperties action was defined in the form --> 21 19 <table> 22 <tr><td colspan="3"><h4> defaultentity</h4></td></tr>20 <tr><td colspan="3"><h4>${importer_entity.name}</h4></td></tr> 23 21 <tr> 24 22 <td class="header" width="55px">
Note: See TracChangeset
for help on using the changeset viewer.