Changeset 1653 for trunk/grails-app/controllers/generic

Timestamp:

Mar 18, 2011, 4:06:07 PM (13 years ago)

Author:

work@…

Message:

• config file stuff into it's page logic

File:

• trunk/grails-app/controllers/generic/installation/SetupController.groovy (modified) (3 diffs)

trunk/grails-app/controllers/generic/installation/SetupController.groovy

@@ -59 +59 @@
                         println config.dataSource.dump()
 
-                        def configPath = new File("/etc/${meta(name: 'app.name')}/")
-                        if (configPath.exists()) {
-                                println "path exists"
-                        } else {
-                                println "path does not exist"
-                        }
-
-                        if (configPath.canWrite()) {
-                                println "path is writable"
-                        } else {
-                                println "path is not writable"
-                        }
-
-                        def configFile = new File("/etc/${meta(name: 'app.name')}/${grails.util.GrailsUtil.environment}.properties")
-                        if (configFile.exists()) {
-                                println "file exists"
-                        } else {
-                                println "file does not exist"
-                        }
-
-
                         // define variables in the flow scope which is availabe
                         // throughout the complete webflow also have a look at
@@ -100 +79 @@
                         // define famfamfam icons
                         flow.icons = [
-                            'true'      : 'accept',
+                            true        : 'accept',
                                 false   : 'cancel'
-                        ]
-
-                        // add configuration information to the flow scope
-                        flow.configInfo = [
-                            path                        : configPath,
-                                pathExists              : configPath.exists(),
-                                pathCanRead             : configPath.canRead(),
-                                pathCanWrite    : configPath.canWrite(),
-                                pathSummary             : (configPath.exists() && configPath.canRead() && configPath.canWrite()),
-                                file                    : configFile,
-                                fileExists              : configFile.exists(),
-                                fileCanRead             : configFile.canRead(),
-                                fileCanWrite    : configFile.canWrite(),
-                                fileSummary             : (configFile.exists() && configFile.canRead() && configFile.canWrite())
                         ]
 
@@ -146 +111 @@
 
                                 flow.page = 1
+
+                                // config
+                                def configPath = new File("/etc/${meta(name: 'app.name')}/")
+                                def configFile = new File("/etc/${meta(name: 'app.name')}/${grails.util.GrailsUtil.environment}.properties")
+
+                                // add configuration information to the flow scope
+                                flow.configInfo = [
+                                        path: configPath,
+                                        pathExists: configPath.exists(),
+                                        pathCanRead: configPath.canRead(),
+                                        pathCanWrite: configPath.canWrite(),
+                                        pathSummary: (configPath.exists() && configPath.canRead() && configPath.canWrite()),
+                                        file: configFile,
+                                        fileExists: configFile.exists(),
+                                        fileCanRead: configFile.canRead(),
+                                        fileCanWrite: configFile.canWrite(),
+                                        fileSummary: (configFile.exists() && configFile.canRead() && configFile.canWrite())
+                                ]
+
                                 success()
                         }