mirror of
https://github.com/fluxscape/fluxscape.git
synced 2026-01-11 14:52:54 +01:00
Compare commits
2 Commits
feature/sa
...
fix/close-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ac7b979945 | ||
|
|
fff03c05bf |
@@ -596,12 +596,6 @@ function _fromJSON(item, collectionName, modelScope) {
|
||||
model.set(key, _deserializeJSON(item[key], _type, modelScope));
|
||||
}
|
||||
|
||||
// Add the ACL roles to a global object
|
||||
if (item.objectId && item.ACL) {
|
||||
const aclModel = modelStore.get('--ndl--acl');
|
||||
aclModel.set(item.objectId, item.ACL);
|
||||
}
|
||||
|
||||
return model;
|
||||
}
|
||||
|
||||
|
||||
@@ -5,9 +5,14 @@ const navigation = {
|
||||
async showPopup(componentPath, params) {
|
||||
return new Promise((resolve) => {
|
||||
navigation._noodlRuntime.context.showPopup(componentPath, params, {
|
||||
senderNode: this.nodeScope.componentOwner,
|
||||
/**
|
||||
* @param {string | undefined} action
|
||||
* @param {*} results
|
||||
*/
|
||||
onClosePopup: (action, results) => {
|
||||
resolve({
|
||||
action: action.replace('closeAction-', ''),
|
||||
action: (action || '').replace('closeAction-', ''),
|
||||
parameters: results
|
||||
});
|
||||
}
|
||||
|
||||
@@ -51,8 +51,9 @@ const ClosePopupNode = {
|
||||
}
|
||||
},
|
||||
close: function () {
|
||||
if (this._internal.closeCallback)
|
||||
if (this._internal.closeCallback) {
|
||||
this._internal.closeCallback(this._internal.closeAction, this._internal.resultValues);
|
||||
}
|
||||
},
|
||||
closeActionTriggered: function (name) {
|
||||
this._internal.closeAction = name;
|
||||
|
||||
@@ -53,15 +53,24 @@ const ShowPopupNode = {
|
||||
|
||||
this.context.showPopup(this._internal.target, this._internal.popupParams, {
|
||||
senderNode: this.nodeScope.componentOwner,
|
||||
/**
|
||||
* @param {string | undefined} action
|
||||
* @param {*} results
|
||||
*/
|
||||
onClosePopup: (action, results) => {
|
||||
this._internal.closeResults = results;
|
||||
|
||||
for (var key in results) {
|
||||
if (this.hasOutput('closeResult-' + key)) this.flagOutputDirty('closeResult-' + key);
|
||||
for (const key in results) {
|
||||
if (this.hasOutput('closeResult-' + key)) {
|
||||
this.flagOutputDirty('closeResult-' + key);
|
||||
}
|
||||
}
|
||||
|
||||
if (!action) this.sendSignalOnOutput('Closed');
|
||||
else this.sendSignalOnOutput(action);
|
||||
if (!action) {
|
||||
this.sendSignalOnOutput('Closed');
|
||||
} else {
|
||||
this.sendSignalOnOutput(action);
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user