From 0c98ab5bb5817427a3f126dade828418b24f17fc Mon Sep 17 00:00:00 2001 From: aB0t Date: Wed, 24 Apr 2024 21:22:23 +0200 Subject: [PATCH] update 2024-04-24 21:22:23 --- .../code.php | 6 ++++++ .../code.power | 6 ++++++ .../code.php | 16 ++++++++++++++++ .../code.power | 16 ++++++++++++++++ .../code.php | 6 ++++++ .../code.power | 6 ++++++ 6 files changed, 56 insertions(+) diff --git a/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/code.php b/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/code.php index f3ac657..de049af 100644 --- a/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/code.php +++ b/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/code.php @@ -243,6 +243,12 @@ class Data 'jcb_ce_onBeforeModelCustomViewData', [&$item, &$id, &$table] ); + // Make sure the icon is only an icon path + if (strpos($item->icon, '#') !== false) + { + $item->icon = strstr($item->icon, '#', true); + } + // set GUI mapper $guiMapper = [ 'table' => $table, diff --git a/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/code.power b/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/code.power index 97bbe6b..28c8221 100644 --- a/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/code.power +++ b/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/code.power @@ -201,6 +201,12 @@ 'jcb_ce_onBeforeModelCustomViewData', [&$item, &$id, &$table] ); + // Make sure the icon is only an icon path + if (strpos($item->icon, '#') !== false) + { + $item->icon = strstr($item->icon, '#', true); + } + // set GUI mapper $guiMapper = [ 'table' => $table, diff --git a/src/cef2815b-f72b-402a-b769-f028f676692d/code.php b/src/cef2815b-f72b-402a-b769-f028f676692d/code.php index 3f82ff0..5012669 100644 --- a/src/cef2815b-f72b-402a-b769-f028f676692d/code.php +++ b/src/cef2815b-f72b-402a-b769-f028f676692d/code.php @@ -433,6 +433,22 @@ class Data } unset($view->addtables); + // Make sure the icon is only an icon path + if (strpos($view->icon, '#') !== false) + { + $view->icon = strstr($view->icon, '#', true); + } + // Make sure the icon_add is only an icon_add path + if (strpos($view->icon_add, '#') !== false) + { + $view->icon_add = strstr($view->icon_add, '#', true); + } + // Make sure the icon_add is only an icon_add path + if (strpos($view->icon_category, '#') !== false) + { + $view->icon_category = strstr($view->icon_category, '#', true); + } + // set custom tabs $this->customtabs->set($view); diff --git a/src/cef2815b-f72b-402a-b769-f028f676692d/code.power b/src/cef2815b-f72b-402a-b769-f028f676692d/code.power index 96beadb..cffba30 100644 --- a/src/cef2815b-f72b-402a-b769-f028f676692d/code.power +++ b/src/cef2815b-f72b-402a-b769-f028f676692d/code.power @@ -384,6 +384,22 @@ } unset($view->addtables); + // Make sure the icon is only an icon path + if (strpos($view->icon, '#') !== false) + { + $view->icon = strstr($view->icon, '#', true); + } + // Make sure the icon_add is only an icon_add path + if (strpos($view->icon_add, '#') !== false) + { + $view->icon_add = strstr($view->icon_add, '#', true); + } + // Make sure the icon_add is only an icon_add path + if (strpos($view->icon_category, '#') !== false) + { + $view->icon_category = strstr($view->icon_category, '#', true); + } + // set custom tabs $this->customtabs->set($view); diff --git a/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/code.php b/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/code.php index 541af4c..93ba301 100644 --- a/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/code.php +++ b/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/code.php @@ -404,6 +404,12 @@ final class Data ) ); + // Make sure the image is only an image path + if (strpos($component->image, '#') !== false) + { + $component->image = strstr($component->image, '#', true); + } + // set the website and autor for global use (default to VDM if not found) $this->config->set('project_website', $component->website ?? 'https://dev.vdm.io'); $this->config->set('project_author', $component->author ?? 'VDM'); diff --git a/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/code.power b/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/code.power index b89346c..b5fcf03 100644 --- a/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/code.power +++ b/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/code.power @@ -354,6 +354,12 @@ ) ); + // Make sure the image is only an image path + if (strpos($component->image, '#') !== false) + { + $component->image = strstr($component->image, '#', true); + } + // set the website and autor for global use (default to VDM if not found) $this->config->set('project_website', $component->website ?? 'https://dev.vdm.io'); $this->config->set('project_author', $component->author ?? 'VDM');