summaryrefslogtreecommitdiffstats
path: root/gui-editors/gui-editor-apex/src/main/resources
diff options
context:
space:
mode:
authorandre.schmid <andre.schmid@est.tech>2021-10-27 19:01:30 +0100
committerAndré Schmid <andre.schmid@est.tech>2021-10-28 10:31:38 +0000
commit08b6e0e63e4524d02507d6709710b53f87690cc0 (patch)
treed005ccc2423ad17eb91bf6eccaa43c3cef6396f7 /gui-editors/gui-editor-apex/src/main/resources
parent5bd5e5a0e64afff9c285860f1f5069e6acc25d67 (diff)
Add user id only when it was provided
During the policy upload call, the user id is being added as a query parameter even if it was not provided, causing to provide the value "null" as the userId parameter. This change just add the userId to the call when it is available. Issue-ID: POLICY-3796 Signed-off-by: andre.schmid <andre.schmid@est.tech> Change-Id: I7bcc928f1ca144ee1ad05e7d1028ea08a15ebd42
Diffstat (limited to 'gui-editors/gui-editor-apex/src/main/resources')
-rw-r--r--gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexFiles.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexFiles.js b/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexFiles.js
index a002788..de9edf3 100644
--- a/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexFiles.js
+++ b/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexFiles.js
@@ -58,10 +58,13 @@ function files_fileDownload() {
}
function files_fileUpload() {
- var requestURL = window.restRootURL + "/Model/Upload?userId=" + new URLSearchParams(window.location.search).get('userId');
-
+ let requestURL = window.restRootURL + "/Model/Upload";
+ const userId = new URLSearchParams(window.location.search).get('userId');
+ if (userId) {
+ requestURL = requestURL + "?userId=" + userId;
+ }
ajax_getOKOrFail(requestURL, function(data) {
- var uploadResultString = "";
+ let uploadResultString = "";
for (let value of data.messages.message) {
uploadResultString += (value + "\n");
}