Changeset 1352

Timestamp:

Jan 7, 2011, 4:51:56 PM (12 years ago)

Author:

work@…

Message:

• removed the 'wait for save page' as this is already being handled by the ajaxflow 'please wait' dialogue

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/StudyWizardController.groovy (modified) (20 diffs)
• views/studyWizard/pages/_wait.gsp (deleted)

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

@@ -270 +270 @@
                         on("quickSave") {
                                 studyPage(flow, flash, params) ? success() : error()
-                        }.to "waitForSave"
+                        }.to "save"
                         on("toPageTwo") {
                                 studyPage(flow, flash, params) ? success() : error()
@@ -288 +288 @@
                         on("toPageSeven") {
                                 studyPage(flow, flash, params) ? success() : error()
-                        }.to "waitForSave"
+                        }.to "save"
                 }
 
@@ -349 +349 @@
                                 // handle form data
                                 subjectPage(flow, flash, params) ? success() : error()
-                        }.to "waitForSave"
+                        }.to "save"
                         on("toPageOne") {
                                 subjectPage(flow, flash, params) ? success() : error()
@@ -367 +367 @@
                         on("toPageSeven") {
                                 subjectPage(flow, flash, params) ? success() : error()
-                        }.to "waitForSave"
+                        }.to "save"
                 }
 
@@ -573 +573 @@
                                 // handle form data
                                 eventPage(flow, flash, params) ? success() : error()
-                        }.to "waitForSave"
+                        }.to "save"
                         on("toPageOne") {
                                 eventPage(flow, flash, params) ? success() : error()
@@ -591 +591 @@
                         on("toPageSeven") {
                                 eventPage(flow, flash, params) ? success() : error()
-                        }.to "waitForSave"
+                        }.to "save"
                 }
 
@@ -651 +651 @@
                         on("toPageSeven") {
                                 eventPage(flow, flash, params) ? success() : error()
-                        }.to "waitForSave"
+                        }.to "save"
                 }
 
@@ -675 +675 @@
                                 // handle form data
                                 groupPage(flow, flash, params) ? success() : error()
-                        }.to "waitForSave"
+                        }.to "save"
                         on("toPageOne") {
                                 groupPage(flow, flash, params) ? success() : error()
@@ -693 +693 @@
                         on("toPageSeven") {
                                 groupPage(flow, flash, params) ? success() : error()
-                        }.to "waitForSave"
+                        }.to "save"
                 }
 
@@ -712 +712 @@
                         on("toPageFive").to "assays"
                         on("toPageSix").to "confirm"
-                        on("toPageSeven").to "waitForSave"
+                        on("toPageSeven").to "save"
                 }
 
@@ -778 +778 @@
                                 // handle form data
                                 samplePage(flow, flash, params) ? success() : error()
-                        }.to "waitForSave"
+                        }.to "save"
                         on("toPageOne") {
                                 samplePage(flow, flash, params) ? success() : error()
@@ -796 +796 @@
                         on("toPageSeven") {
                                 samplePage(flow, flash, params) ? success() : error()
-                        }.to "waitForSave"
+                        }.to "save"
                 }
 
@@ -905 +905 @@
                                 // handle form data
                                 assayPage(flow, flash, params) ? success() : error()
-                        }.to "waitForSave"
+                        }.to "save"
                         on("toPageOne") {
                                 assayPage(flow, flash, params) ? success() : error()
@@ -923 +923 @@
                         on("toPageSeven") {
                                 assayPage(flow, flash, params) ? success() : error()
-                        }.to "waitForSave"
+                        }.to "save"
                 }
 
@@ -971 +971 @@
                                 // handle form data
                                 assayGroupPage(flow, flash, params) ? success() : error()
-                        }.to "waitForSave"
+                        }.to "save"
                         on("toPageOne") {
                                 assayGroupPage(flow, flash, params) ? success() : error()
@@ -989 +989 @@
                         on("toPageSeven") {
                                 assayGroupPage(flow, flash, params) ? success() : error()
-                        }.to "waitForSave"
+                        }.to "save"
                 }
 
@@ -1029 +1029 @@
                         on("toAssayGroups").to "assayGroups"
                         on("previous").to "confirmPrevious"
-                        on("next").to "waitForSave"
-                        on("quickSave").to "waitForSave"
+                        on("next").to "save"
+                        on("quickSave").to "save"
                         on("toPageOne").to "study"
                         on("toPageTwo").to "subjects"
@@ -1036 +1036 @@
                         on("toPageFour").to "samples"
                         on("toPageFive").to "assays"
-                        on("toPageSeven").to "waitForSave"
-                }
-
-                waitForSave {
-                        render(view: "_wait")
-                        onRender {
-                                // Grom a development message
-                                if (pluginManager.getGrailsPlugin('grom')) "rendering the partial: pages/_wait.gsp".grom()
-
-                                flow.page = 7
-                        }
-                        on("next").to "save"
+                        on("toPageSeven").to "save"
                 }
 
@@ -1098 +1087 @@
                                 flow.page = 6
                         }
-                        on("next").to "waitForSave"
+                        on("next").to "save"
                         on("previous").to "samples"
                         on("toPageOne").to "study"
@@ -1106 +1095 @@
                         on("toPageFive").to "assays"
                         on("toPageSix").to "confirm"
-                        on("toPageSeven").to "waitForSave"              }
+                        on("toPageSeven").to "save"             }
 
                 // render finish page