Changeset 1421

Timestamp:

Jan 20, 2011, 6:13:33 PM (13 years ago)

Author:

work@…

Message:

• fixed importer issue with the authentication service not being available in static scope

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (5 diffs)
• services/dbnp/importer/ImporterService.groovy (modified) (3 diffs)

trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy

@@ -36 +36 @@
         // (see http://www.grails.org/plugin/grom)
         def pluginManager
-        def AuthenticationService
+        def authenticationService
         def fileService
         def ImporterService
@@ -90 +90 @@
                         flow.pages = [
                                 [title: 'Import file'],
-                                [title: 'Properties'],
-                                [title: 'Mappings'],
+                                [title: 'Assign properties'],
+                                [title: 'Check imported data'],
                                 //[title: 'Imported'],
-                                [title: 'Persist']
+                                [title: 'Done']
                         ]
                         flow.cancel = true;
@@ -127 +127 @@
 
                                 flow.page = 1
-                                flow.studies = Study.findAllWhere(owner: AuthenticationService.getLoggedInUser())
+                                flow.studies = Study.findAllWhere(owner: authenticationService.getLoggedInUser())
                                 flow.importer_importableentities = grailsApplication.config.gscf.domain.importableEntities
 
@@ -140 +140 @@
                                 // Trying to import data into an existing study?
                                 if (flow.importer_study)
-                                        if (flow.importer_study.canWrite(AuthenticationService.getLoggedInUser())) {
+                                        if (flow.importer_study.canWrite(authenticationService.getLoggedInUser())) {
                                                 if (fileImportPage(flow, params)) {
                                                         success()
@@ -521 +521 @@
                 //def (validatedSuccesfully, updatedEntities, failedToPersist) =
                 //try {
-                ImporterService.saveDatamatrix(flow.importer_study, flow.importer_importeddata)
+                ImporterService.saveDatamatrix(flow.importer_study, flow.importer_importeddata, authenticationService)
 
                 //}

trunk/grails-app/services/dbnp/importer/ImporterService.groovy

@@ -31 +31 @@
 
 class ImporterService {
-        def AuthenticationService
+        def authenticationService
 
         boolean transactional = true
@@ -276 +276 @@
          * @param datamatrix two dimensional array containing entities with values read from Excel file
          */
-        static saveDatamatrix(Study study, datamatrix) {
+        static saveDatamatrix(Study study, datamatrix, authenticationService) {
                 def validatedSuccesfully = 0
                 def entitystored = null
@@ -288 +288 @@
                                 switch (entity.getClass()) {
                                         case Study: println "Persisting Study `" + entity + "`: "
-                                                entity.owner = AuthenticationService.getLoggedInUser()
+                                                entity.owner = authenticationService.getLoggedInUser()
                                                 persistEntity(entity)
                                                 break