joomla/Component-Builder
40
26
Fork 12
Code Issues 79 Pull Requests 2 Projects 4 Wiki Activity

Release of v5.0.3-alpha2

Browse Source 
Fix library save as copy error. #1162. Fix the error when no components exists. #1164. Fix search page error due to File class.
This commit is contained in:
Robot
2024-08-21 21:37:52 +02:00
parent 29fef2cbea
commit 045e6df2e2
14 changed files with 62 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
admin/src/Model/CompilerModel.php
View File

@@ -445,10 +445,10 @@ class CompilerModel extends ListModel
/**
* Get all components in the system
*
* @return array
* @return array|null
* @since 3.2.0
**/
public function getComponents(): array
public function getComponents(): ?array
{
// Get a db connection.
$db = $this->getDbo();
@@ -471,9 +471,8 @@ class CompilerModel extends ListModel
$db->setQuery($query);
// return the result
return $db->loadObjectList();
return $db->loadObjectList() ?? null;
}
/**
* Get all dynamic content

2
admin/src/Model/LibraryModel.php
View File

@@ -1176,7 +1176,7 @@ class LibraryModel extends AdminModel
// also check to insure these names are not used again
if (!isset(ComponentbuilderHelper::$libraryNames[$data['id']]) && in_array($data['name'], ComponentbuilderHelper::$libraryNames))
{
$data['name'] = $this->generateUniqe('name', $data['name']);
$data['name'] = $this->generateUnique('name', $data['name']);
}
// Set the Params Items to data

9
admin/src/Model/SearchModel.php
View File

@@ -352,10 +352,10 @@ class SearchModel extends ItemModel
/**
* Get all components in the system
*
* @return array
* @return array|null
* @since 3.2.0
**/
public function getComponents(): array
public function getComponents(): ?array
{
// Get a db connection.
$db = $this->getDbo();
@@ -378,7 +378,6 @@ class SearchModel extends ItemModel
$db->setQuery($query);
// return the result
return $db->loadObjectList();
}
return $db->loadObjectList() ?? null;
}
}

4
admin/src/View/Compiler/HtmlView.php
View File

@@ -660,13 +660,13 @@ class HtmlView extends BaseHtmlView
foreach (ComponentbuilderHelper::$uk_components[$class] as $name)
{
// check if the CSS file exists.
if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css'))
if (@file_exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css'))
{
// load the css.
Html::_('stylesheet', 'media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']);
}
// check if the JavaScript file exists.
if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js'))
if (@file_exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js'))
{
// load the js.
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']);

4
admin/src/View/Get_snippets/HtmlView.php
View File

@@ -167,13 +167,13 @@ class HtmlView extends BaseHtmlView
foreach (ComponentbuilderHelper::$uk_components[$class] as $name)
{
// check if the CSS file exists.
if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css'))
if (@file_exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css'))
{
// load the css.
Html::_('stylesheet', 'media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']);
}
// check if the JavaScript file exists.
if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js'))
if (@file_exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js'))
{
// load the js.
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']);

4
admin/src/View/Search/HtmlView.php
View File

@@ -384,13 +384,13 @@ class HtmlView extends BaseHtmlView
foreach (ComponentbuilderHelper::$uk_components[$class] as $name)
{
// check if the CSS file exists.
if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css'))
if (@file_exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css'))
{
// load the css.
Html::_('stylesheet', 'media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']);
}
// check if the JavaScript file exists.
if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js'))
if (@file_exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js'))
{
// load the js.
Html::_('script', 'media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']);