From ed1be7023592c4ca1cbb137c6fa5fbab75725191 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Tue, 11 Aug 2020 15:48:18 +0200 Subject: [PATCH] Fix no application value gets set on acl edit dialog --- admin/js/app.js | 5 ++++- admin/js/app.ts | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/admin/js/app.js b/admin/js/app.js index c56ee3e622..3f39b6e2c3 100644 --- a/admin/js/app.js +++ b/admin/js/app.js @@ -640,7 +640,10 @@ var AdminApp = /** @class */ (function (_super) { buttons: et2_dialog.BUTTONS_OK_CANCEL, value: { content: content, - sel_options: sel_options, + // @todo: we need to investigate more on et2_widget_selectbox type of apps + // where the sel options are not ready while setting its content. Therefore, + // the explicit apps should be removed after fixing it on the widget side. + sel_options: jQuery.extend(sel_options, { apps: sel_options.filter2 }), modifications: modifications, readonlys: readonlys }, diff --git a/admin/js/app.ts b/admin/js/app.ts index ab03fea05a..f968e5b11d 100644 --- a/admin/js/app.ts +++ b/admin/js/app.ts @@ -735,7 +735,10 @@ class AdminApp extends EgwApp buttons: et2_dialog.BUTTONS_OK_CANCEL, value: { content: content, - sel_options: sel_options, + // @todo: we need to investigate more on et2_widget_selectbox type of apps + // where the sel options are not ready while setting its content. Therefore, + // the explicit apps should be removed after fixing it on the widget side. + sel_options: jQuery.extend(sel_options, {apps: sel_options.filter2}), modifications: modifications, readonlys: readonlys },