Show
Ignore:
Timestamp:
28-05-10 11:08:19 (4 years ago)
Author:
tabma
Message:

- properties in simple import wizard now shows all template fields
- moved study chooser in advanced wizard to first page

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy

    r489 r492  
    5353    * and the first n rows to the preview 
    5454    * @param importfile uploaded file to import 
     55    * @param study.id study identifier 
    5556    */ 
    5657    def upload_advanced = { 
    5758        def wb = handleUpload('importfile') 
     59 
    5860         
    5961        session.importer_header = ImporterService.getHeader(wb, 0) 
    6062        session.importer_template_id = params.template_id 
     63        session.importer_study = Study.get(params.study.id.toInteger()) 
    6164        session.importer_workbook = wb 
    6265 
     
    9396        def templates = Template.get(session.importer_template_id) 
    9497         
    95         render(view:"step2", model:[entities: selectedentities, header:session.importer_header, templates:templates]) 
     98        render(view:"step2_simple", model:[entities: selectedentities, header:session.importer_header, templates:templates]) 
    9699    } 
    97100 
     
    194197    */ 
    195198    def saveproperties = {       
    196         session.importer_study = Study.get(params.study.id.toInteger()) 
    197199 
    198200        params.columnproperty.index.each { columnindex, property_id ->