Fix all buttons performing the "complete" action

[adhocweb.git] / js / adhoc.js

diff --git a/js/adhoc.js b/js/adhoc.js
index 3638eef87a99fc4c0c86040c228b340a26a690b0..cbe27523ab1ab905719fa82ca2fdce232d15c503 100644 (file)
--- a/js/adhoc.js
+++ b/js/adhoc.js
@@ -156,6 +156,7 @@ Adhoc.prototype = {
         var self = this;
         var status = $(result).find("command").attr("status");
         var kinds = {'prev': 'Prev', 'next': 'Next', 'complete': 'Complete'};
+       var actions = $(result).find("actions:first");
 
         $(self.status.view).empty();
         $(result).find("command > *").each(function() {
@@ -169,19 +170,17 @@ Adhoc.prototype = {
            var controls = $("<div class='actions'/>");
             for (kind in kinds) {
                var input;
-                (function(type) {
-                    input = $("<input type='button' disabled='disabled' class='btn' value='" + kinds[type] + "'/>").click(function() {
-                        self.executeCommand(type, (type!= 'prev') && self.serializeToDataform('form'), function(e) { self.displayResult(e) });
-                    }).appendTo(controls);
-                })(kind);
-                if ($(result).find('actions ' + kind).length > 0)
+               (function (type) {
+                   input = $("<input type='button' disabled='disabled' class='btn' value='" + kinds[type] + "'/>").click(function() {
+                       self.executeCommand(type, (type != 'prev') && self.serializeToDataform('form'), function(e) { self.displayResult(e) });
+                   }).appendTo(controls);
+               })(kind);
+                if (actions.find(kind).length > 0)
                     input.removeAttr("disabled");
+               if (actions.attr("execute") == kind)
+                   input.addClass("primary");
             }
 
-            $("<input type='button' id='executeButton' class='btn primary' value='Execute'/>").click(function() {
-                self.executeCommand("execute", self.serializeToDataform('form'), function(e) { self.displayResult(e) });
-            }).appendTo(controls);
-
             $("<input type='button' class='btn' value='Cancel'/>").click(function() {
                 self.cancelCommand(function(e) { self.displayResult(e) });
             }).appendTo(controls);