From a96b2359cae9ec5a967e68ae1030d15564ccf880 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 24 Jun 2019 18:52:39 +0200 Subject: [PATCH] Fixed getFillColor --- .../include/rest-api/models/VisualConsole/Item.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/rest-api/models/VisualConsole/Item.php b/pandora_console/include/rest-api/models/VisualConsole/Item.php index f99afcfbd3..3105233b31 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Item.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Item.php @@ -1342,12 +1342,12 @@ class Item extends CachedModel $result['label_position'] = $label_position; } - $border_color = static::extractBorderColor($data); + $border_color = static::getBorderColor($data); if ($border_color !== null) { $result['border_color'] = $border_color; } - $fill_color = static::extractFillColor($data); + $fill_color = static::getFillColor($data); if ($fill_color !== null) { $result['fill_color'] = $fill_color; } @@ -1593,7 +1593,7 @@ class Item extends CachedModel * * @return mixed String representing the border color (not empty) or null. */ - private function extractBorderColor(array $data) + private static function getBorderColor(array $data) { return static::notEmptyStringOr( static::issetInArray($data, ['borderColor', 'border_color', 'gridColor', 'color', 'legendBackgroundColor']), @@ -1609,7 +1609,7 @@ class Item extends CachedModel * * @return mixed String representing the fill color (not empty) or null. */ - private function extractFillColor(array $data) + private static function getFillColor(array $data) { return static::notEmptyStringOr( static::issetInArray($data, ['fillColor', 'fill_color', 'labelColor']),