ActionBar: Tooltips für Deaktivierung überschreibt normalen Tooltip

[kivitendo-erp.git] / js / kivi.ActionBar.js

diff --git a/js/kivi.ActionBar.js b/js/kivi.ActionBar.js
index 2836add..d732783 100644 (file)
--- a/js/kivi.ActionBar.js
+++ b/js/kivi.ActionBar.js
@@ -110,9 +110,9 @@ namespace('kivi', function(k){
     var data = $(e).data('action');
     if (undefined === data) return;
 
-    if (data.disabled) {
+    if (data.disabled && (data.disabled != '0')) {
       $(e).addClass(CLASSES.disabled);
-      if (!data.tooltip && (data.disabled != '1'))
+      if (data.disabled != '1')
         data.tooltip = data.disabled;
     }
 
@@ -139,9 +139,13 @@ namespace('kivi', function(k){
         if (data.checks) {
           for (var i=0; i < data.checks.length; i++) {
             check = data.checks[i];
-            func = kivi.get_function_by_name(check);
-            if (!func) console.log('Cannot find check function: ' + check);
-            if (!func()) return;
+            if (check.constructor !== Array)
+              check = [ check ];
+            func = kivi.get_function_by_name(check[0]);
+            if (!func)
+              console.log('Cannot find check function: ' + check);
+            if (!func.apply(document, check.slice(1)))
+              return;
           }
         }
         if (data.confirm && !confirm(data.confirm)) return;
@@ -153,6 +157,7 @@ namespace('kivi', function(k){
           var form   = data.submit[0];
           var params = data.submit[1];
           for (key in params) {
+            $('[name=' + key + ']').remove();
             $hidden = $('<input type=hidden>');
             $hidden.attr('name', key);
             $hidden.attr('value', params[key]);
@@ -163,6 +168,10 @@ namespace('kivi', function(k){
         if (data.link) {
           window.location.href = data.link;
         }
+        if ((data.only_once !== undefined) && (data.only_once !== 0)) {
+          $(e).addClass(CLASSES.disabled);
+          $(e).tooltipster({ content: kivi.t8("The action can only be executed once."), theme: 'tooltipster-light' });
+        }
       });
     }
   };