tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed errors VC

This commit is contained in:
Daniel Barbero Martin 2020-01-28 18:29:32 +01:00
parent 5906273271
commit e49ed85d03
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/include/javascript/pandora_visual_console.js
View File

@ -145,6 +145,7 @@ function createVisualConsole(
data.link != null &&
data.link.length > 0 &&
(data.linkedLayoutAgentId == null || data.linkedLayoutAgentId === 0) &&
data.linkedLayoutNodeId === 0 &&
e.nativeEvent.metaKey === false
) {
// Override the link to another VC if it isn't on remote console.

8
pandora_console/include/rest-api/models/VisualConsole/Items/Clock.php
View File

@ -387,6 +387,10 @@ final class Clock extends Item
*/
public function getDefaultGeneralValues(array $values): array
{
if (isset($values['isLinkEnabled']) === false) {
$values['isLinkEnabled'] = false;
}
// Retrieve global - common inputs.
$values = parent::getDefaultGeneralValues($values);
@ -399,10 +403,6 @@ final class Clock extends Item
$values['height'] = 100;
}
if (isset($values['isLinkEnabled']) === false) {
$values['isLinkEnabled'] = false;
}
return $values;
}

6
pandora_console/include/rest-api/models/VisualConsole/Items/Icon.php
View File

@ -215,13 +215,13 @@ final class Icon extends Item
*/
public function getDefaultGeneralValues(array $values): array
{
// Retrieve global - common inputs.
$values = parent::getDefaultGeneralValues($values);
if (isset($values['isLinkEnabled']) === false) {
$values['isLinkEnabled'] = false;
}
// Retrieve global - common inputs.
$values = parent::getDefaultGeneralValues($values);
return $values;
}

8
pandora_console/include/rest-api/models/VisualConsole/Items/Label.php
View File

@ -75,6 +75,10 @@ final class Label extends Item
*/
public function getDefaultGeneralValues(array $values): array
{
if (isset($values['isLinkEnabled']) === false) {
$values['isLinkEnabled'] = false;
}
// Retrieve global - common inputs.
$values = parent::getDefaultGeneralValues($values);
@ -87,10 +91,6 @@ final class Label extends Item
$values['height'] = 10;
}
if (isset($values['isLinkEnabled']) === false) {
$values['isLinkEnabled'] = false;
}
return $values;
}