Merge branch 'ent-4258-visual-console-movement-redimension-mode' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4258-visual-console-movement-redimension-mode

2019-06-24 18:27:06 +02:00 · 2019-06-24 18:27:06 +02:00 · f8a0ee7442
parent 3409e321d3 a06cc36713
commit f8a0ee7442
2 changed files with 6 additions and 2 deletions
--- a/pandora_console/include/rest-api/models/VisualConsole/Item.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Item.php
@ -1546,7 +1546,7 @@ class Item extends CachedModel
    protected static function getImageSrc(array $data)
    {
        $imageSrc = static::notEmptyStringOr(
-            static::issetInArray($data, ['imageSrc', 'image', 'backgroundColor', 'backgroundType', 'valueType']),
+            static::issetInArray($data, ['image', 'imageSrc', 'backgroundColor', 'backgroundType', 'valueType']),
            null
        );

--- a/pandora_console/include/visual-console-client/vc.main.min.js.map
+++ b/pandora_console/include/visual-console-client/vc.main.min.js.map