Mirrors/VILLASweb
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00
Code Issues Releases Wiki Activity

add https:// scheme to result and model files in start action, closes #301

Browse source
This commit is contained in:
Sonja Happ 2021-03-17 09:06:08 +01:00
parent ea82a19bab
commit 31e1da9ee1
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ic/ic-action.js
View file

@ -74,14 +74,14 @@ class ICAction extends React.Component {
* see: https://villas.fein-aachen.org/doc/controller-protocol.html
*/
if (newAction.action == "create" || newAction.action === "delete") {
if (newAction.action === "create" || newAction.action === "delete") {
// prepare parameters for delete incl. correct IC id
newAction["parameters"] = {};
if (newAction.action == "delete") {
if (newAction.action === "delete") {
newAction.parameters["uuid"] = ic.uuid;
}
else if (newAction.action == "create") {
else if (newAction.action === "create") {
newAction.parameters = ic.statusupdateraw.properties;
}

4
src/ic/ic-store.js
View file

@ -88,14 +88,14 @@ class InfrastructureComponentStore extends ArrayStore {
// adapt URL for newly created result ID
a.results.url = a.results.url.replace("RESULTID", action.data.result.id);
a.results.url = ICsDataManager.makeURL(a.results.url);
a.results.url = window.location.host + a.results.url;
a.results.url = 'https://' + window.location.host + a.results.url;
}
if (a.model !== undefined && a.model != null && JSON.stringify(a.model) !== JSON.stringify({})) {
// adapt URL(s) for model file
let modelURLs = []
for (let url of a.model.url){
let modifiedURL = ICsDataManager.makeURL(url);
modifiedURL = window.location.host + modifiedURL;
modifiedURL = 'https://' + window.location.host + modifiedURL;
modelURLs.push(modifiedURL)
}
a.model.url = modelURLs