Changeset 863

Timestamp:

Mar 14, 2011, 2:50:56 PM (14 years ago)

Author:

gav

Message:

Add check for submit_confirmResult in entry create ajax.

Location:

trunk

Files:

• grails-app/views/entryDetailed/_create.gsp (modified) (1 diff)
• web-app/js/taskShow.js (modified) (3 diffs)

trunk/grails-app/views/entryDetailed/_create.gsp

@@ -121 +121 @@
                                 type="button" 
                                 value="Resolved"
-                                onclick="return confirm('${message(code:'task.clear.attention.flag.on.completion.confirm')}');"
+                                onclick="submit_confirmResult = confirm('${message(code:'task.clear.attention.flag.on.completion.confirm')}');"
                                 name="submit_andComplete"/>
                 </g:if>

trunk/web-app/js/taskShow.js

@@ +1 @@
+
+var submit_confirmResult = true
 
 function showButton(button) {
@@ -17 +19 @@
     });
     // Register 'submit_*' input button click handlers.
-    target.find('input[name^="submit_"]').click(function(){
+    target.find('input[name^="submit_"]').click(function(e){
         target.find(':input[name="submitAction"]').val(jQuery(this).attr('name'));
         target.find('form:first').submit();
@@ -35 +37 @@
 function submitCreateEntryForm(event) {
 
+    event.preventDefault();
+
+    if(submit_confirmResult == false) {
+        submit_confirmResult = true
+        return false;
+    }
+
     var actionUrl = getContextPath()+"/entryDetailed/ajaxSave/";
-
-    event.preventDefault();
     var listContainer = event.data.listContainer;
     var source = event.data.source;