projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2da8f5c
)
ActionBar: checks korrekt interpretieren
author
Sven Schöling
<s.schoeling@linet-services.de>
Mon, 10 Oct 2016 12:23:19 +0000
(14:23 +0200)
committer
Moritz Bunkus
<m.bunkus@linet-services.de>
Tue, 28 Feb 2017 09:04:33 +0000
(10:04 +0100)
js/kivi.ActionBar.js
patch
|
blob
|
history
diff --git
a/js/kivi.ActionBar.js
b/js/kivi.ActionBar.js
index
2c28d9b
..
6e7cc16
100644
(file)
--- a/
js/kivi.ActionBar.js
+++ b/
js/kivi.ActionBar.js
@@
-11,12
+11,14
@@
namespace('kivi', function(k){
var form = data.submit[0];
var params = data.submit[1];
$(e).click(function(event) {
var form = data.submit[0];
var params = data.submit[1];
$(e).click(function(event) {
- var $hidden, key, func;
+ var $hidden, key, func
, check
;
if (data.disabled) return;
if (data.confirm && !confirm(data.confirm)) return;
if (data.checks) {
if (data.disabled) return;
if (data.confirm && !confirm(data.confirm)) return;
if (data.checks) {
- for (var check in data.check) {
+ for (var i=0; i < data.checks.length; i++) {
+ check = data.checks[i];
func = kivi.get_function_by_name(check);
func = kivi.get_function_by_name(check);
+ if (!func) console.log('Cannot find check function: ' + check);
if (!func()) return;
}
}
if (!func()) return;
}
}
@@
-30,14
+32,15
@@
namespace('kivi', function(k){
})
} else if (data.function) {
// TODO: what to do with templated calls
})
} else if (data.function) {
// TODO: what to do with templated calls
- console.log(data.function)
$(e).click(function(event) {
var func;
if (data.disabled) return;
if (data.confirm && !confirm(data.confirm)) return;
if (data.checks) {
$(e).click(function(event) {
var func;
if (data.disabled) return;
if (data.confirm && !confirm(data.confirm)) return;
if (data.checks) {
- for (var check in data.check) {
+ for (var i=0; i < data.checks.length; i++) {
+ check = data.checks[i];
func = kivi.get_function_by_name(check);
func = kivi.get_function_by_name(check);
+ if (!func) console.log('Cannot find check function: ' + check);
if (!func()) return;
}
}
if (!func()) return;
}
}