Download multi keys before evaluate auth module to display (#883)
This commit is contained in:
parent
773ccfe718
commit
cc5dfe2c91
@ -29,6 +29,9 @@ var filterFunctions = {
|
|||||||
for (var i = 1; i < 3; i++) {
|
for (var i = 1; i < 3; i++) {
|
||||||
node.nodes[i].data = node.nodes[0].data;
|
node.nodes[i].data = node.nodes[0].data;
|
||||||
}
|
}
|
||||||
|
if (node.nodes[0].data.match(/^Multi/)) {
|
||||||
|
node.nodes[2].data = 'Null';
|
||||||
|
}
|
||||||
//all = true;
|
//all = true;
|
||||||
}
|
}
|
||||||
node.nodes.forEach(function(n) {
|
node.nodes.forEach(function(n) {
|
||||||
@ -48,16 +51,22 @@ var filterFunctions = {
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
scope.waiting = true;
|
scope.waiting = true;
|
||||||
console.log('coucou');
|
|
||||||
scope.download({
|
scope.download({
|
||||||
'$modelValue': nd[1]
|
'$modelValue': nd[1]
|
||||||
}).then(function() {
|
}).then(function() {
|
||||||
filterFunctions.authParams(scope, $q, node)
|
filterFunctions.authParams(scope, $q, node)
|
||||||
});
|
});
|
||||||
|
return;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
else if (node.nodes[0].data == 'Multi' && n.id == 'multiParams') {
|
else if (node.nodes[0].data == 'Multi' && n.id == 'multiParams') {
|
||||||
var nd = n._nodes ? n._nodes : n.nodes;
|
var nd = n._nodes ? n._nodes : n.nodes;
|
||||||
|
if (typeof nd[0].data === 'undefined') {
|
||||||
|
$q.all([scope.getKey(nd[0]), scope.getKey(nd[1])]).then(function() {
|
||||||
|
filterFunctions.authParams(scope, $q, node)
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
/* TODO: Change this with multiValueSeparator when it will be set in tree */
|
/* TODO: Change this with multiValueSeparator when it will be set in tree */
|
||||||
var sep = ';';
|
var sep = ';';
|
||||||
var reg = new RegExp(sep + '\\s*(\\w+)', 'g');
|
var reg = new RegExp(sep + '\\s*(\\w+)', 'g');
|
||||||
|
Loading…
Reference in New Issue
Block a user