Changeset 279

Timestamp:

Mar 17, 2010, 3:18:54 PM (13 years ago)

Author:

duh

Message:

• improved try catch block in wizard data saving
• if saving fails, the generated exception is shown in the client's error feedback dialog and a stacktrace is shown in the console
• navigating away from last wizard page does not result in a warning anymore
• last page does not contain a 'previous' button anymore as this makes no sense at all

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (1 diff)
• grails-app/views/wizard/common/_error.gsp (modified) (1 diff)
• grails-app/views/wizard/common/_navigation.gsp (modified) (1 diff)
• grails-app/views/wizard/pages/_done.gsp (modified) (1 diff)
• web-app/js/wizard.js (modified) (2 diffs)

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

@@ -502 +502 @@
                                         println "saved study "+flow.study+" (id: "+flow.study.id+")"
 
+                                        // commit transaction
+                                        println "commit"
+                                        transaction.commit()
+                                        success()
                                 } catch (Exception e) {
                                         // rollback
+                                        this.appendErrorMap(['exception': e.toString() + ', see log for stacktrace' ], flash.errors)
+
+                                        // debug line
+                                        println e.printStackTrace()
+
                                         println "rollback"
                                         transaction.rollback()
                                         error()
                                 }
-
-                                // commit transaction
-                                println "commit"
-                                transaction.commit()
-                                success()
                         }
                         on("error").to "error"

trunk/grails-app/views/wizard/common/_error.gsp

@@ -36 +36 @@
 
                 // show error dialog
-                $(function() {
-                        $("div#wizardError").dialog({
-                                modal: true,
-                                width: 600,
-                                buttons: {
-                                        Ok: function() {
-                                                $(this).dialog('close');
-                                        }
+                $("div#wizardError").dialog({
+                        modal: true,
+                        width: 600,
+                        buttons: {
+                                Ok: function() {
+                                        $(this).dialog('close');
                                 }
-                        });
+                        }
                 });
         </script>

trunk/grails-app/views/wizard/common/_navigation.gsp

@@ -15 +15 @@
 %>
     <div class="navigation">
-      <g:if test="${page>1}"><wizard:ajaxButton name="previous" value="&laquo; prev" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" class="prevnext" /></g:if>
+      <g:if test="${page>1 && page<pages.size}"><wizard:ajaxButton name="previous" value="&laquo; prev" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" class="prevnext" /></g:if>
       <g:if test="${page>1 && page<pages.size}"> | </g:if>
       <g:if test="${page<pages.size}"><wizard:ajaxButton name="next" value="next &raquo;" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" class="prevnext" /></g:if>

trunk/grails-app/views/wizard/pages/_done.gsp

@@ -22 +22 @@
         </span>
 
+        <script type="text/javascript">
+                // disable redirect warning
+                var warnOnRedirect = false;
+        </script>
+
 </wizard:pageContent>

trunk/web-app/js/wizard.js

@@ -13 +13 @@
  * $Date$
  */
+var warnOnRedirect = true;
 $(document).ready(function() {
     // check if user is using Firefox 3.6 and warm the user
@@ -61 +62 @@
         if (!element.attr('href').match(/^#/gi) && !element.attr('href').match(/\/([^\/]+)\/wizard\/pages/gi)) {
             // bind a warning to the onclick event
-            element.bind('click',function() { return onDirectWarning(); });
+            element.bind('click',function() {
+                if (warnOnRedirect) {
+                    return onDirectWarning();
+                }
+            });
         }
     })