Skip to content
Snippets Groups Projects
Commit 945048bf authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '310-main-view-in-submap-instead-of-in-submodel' into 'master'

Resolve "Main view: 'in submap' instead of 'in submodel'"

Closes #310

See merge request piotr.gawron/minerva!240
parents 195fc392 af059208
No related branches found
No related tags found
1 merge request!240Resolve "Main view: 'in submap' instead of 'in submodel'"
Pipeline #
......@@ -421,12 +421,12 @@ GuiUtils.prototype.createReactionElement = function (params) {
if (showTitle) {
div.appendChild(self.createLabel("Reaction: " + reaction.getReactionId()));
if (reaction.getModelId() !== self.getMap().getId()) {
div.appendChild(self.createSubMapLink("In submodel: ", reaction.getModelId()));
div.appendChild(self.createSubMapLink("In submap: ", reaction.getModelId()));
}
}
if (reaction.getLinkedSubmodelId() !== null && reaction.getLinkedSubmodelId() !== undefined) {
div.appendChild(self.createSubMapLink("Associated submodel: ", reaction.getLinkedSubmodelId()));
div.appendChild(self.createSubMapLink("Associated submap: ", reaction.getLinkedSubmodelId()));
}
if (showTitle) {
div.appendChild(self.createNewLine());
......@@ -472,11 +472,11 @@ GuiUtils.prototype.createAliasElement = function (params) {
div.appendChild(this.createParamLine(alias.getType() + ": ", alias.getName()));
if (alias.getModelId() !== self.getMap().getId()) {
div.appendChild(self.createSubMapLink("In submodel: ", alias.getModelId()));
div.appendChild(self.createSubMapLink("In submap: ", alias.getModelId()));
}
}
if (alias.getLinkedSubmodelId() !== null && alias.getLinkedSubmodelId() !== undefined) {
div.appendChild(self.createSubMapLink("Associated submodel: ", alias.getLinkedSubmodelId()));
div.appendChild(self.createSubMapLink("Associated submap: ", alias.getLinkedSubmodelId()));
}
if (showTitle) {
div.appendChild(self.createNewLine(3));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment