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

Release of v5.0.2-alpha2

Browse Source 
Fix missing scripts and styles fields and methods in the site admin view model. Update subform field layout across JCB for cleaner look. Remove expansion feature. Fix helper area.
This commit is contained in:
Robot
2024-07-26 18:34:11 +02:00
parent 9f05fb090f
commit 0cbe573fe0
152 changed files with 350 additions and 930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
admin/src/Field/AdminviewfolderlistField.php
View File

@@ -17,6 +17,7 @@ use Joomla\CMS\HTML\HTMLHelper as Html;
use Joomla\CMS\Component\ComponentHelper;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\StringHelper;
use Joomla\CMS\Filesystem\Folder;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -52,7 +53,7 @@ class AdminviewfolderlistField extends ListField
// now check if there are files in the folder
foreach ($localfolders as $localfolder)
{
if (is_dir($localfolder) && $folders = \Joomla\Filesystem\Folder::folders($localfolder))
if (is_dir($localfolder) && $folders = Folder::folders($localfolder))
{
if ($this->multiple === false)
{
@@ -60,7 +61,7 @@ class AdminviewfolderlistField extends ListField
}
foreach ($folders as $folder)
{
$options[] = Html::_('select.option', $folder, StringHelper::safe($folder, 'W'));
$options[] = Html::_('select.option', StringHelper::safe($folder), StringHelper::safe($folder, 'W'));
}
}
}

39
admin/src/Field/AdminviewsField.php
View File

@@ -42,24 +42,27 @@ class AdminviewsField extends ListField
*/
protected function getOptions()
{
// Get the database object.
$db = Factory::getDBO();
$query = $db->getQuery(true);
$query->select($db->quoteName(array('a.id','a.system_name'),array('id','adminview_system_name')));
$query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
$query->where($db->quoteName('a.published') . ' >= 1');
$query->order('a.system_name ASC');
$db->setQuery((string)$query);
$items = $db->loadObjectList();
$options = array();
if ($items)
{
$options[] = Html::_('select.option', '', 'Select an option');
foreach($items as $item)
{
$options[] = Html::_('select.option', $item->id, $item->adminview_system_name);
}
}
return $options;
$query = $db->getQuery(true);
$query->select($db->quoteName(array('a.id','a.system_name'),array('id','adminview_system_name')));
$query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
$query->where($db->quoteName('a.published') . ' >= 1');
$query->order('a.system_name ASC');
$db->setQuery((string)$query);
$items = $db->loadObjectList();
$options = [];
if ($items)
{
if ($this->multiple === false)
{
$options[] = Html::_('select.option', '', Text::_('COM_COMPONENTBUILDER_SELECT_AN_OPTION'));
}
foreach($items as $item)
{
$options[] = Html::_('select.option', $item->id, $item->adminview_system_name);
}
}
return $options;
}
}

38
admin/src/Field/CustomadminviewsField.php
View File

@@ -42,23 +42,27 @@ class CustomadminviewsField extends ListField
*/
protected function getOptions()
{
$db = Factory::getDBO();
$query = $db->getQuery(true);
$query->select($db->quoteName(array('a.id','a.system_name'),array('id','customadminview_system_name')));
$query->from($db->quoteName('#__componentbuilder_custom_admin_view', 'a'));
$query->where($db->quoteName('a.published') . ' >= 1');
$query->order('a.system_name ASC');
$db->setQuery((string)$query);
$items = $db->loadObjectList();
$options = array();
if ($items)
{
$options[] = Html::_('select.option', '', 'Select an option');
foreach($items as $item)
{
$options[] = Html::_('select.option', $item->id, $item->customadminview_system_name);
}
}
// Get the databse object.
$db = Factory::getDBO();
$query = $db->getQuery(true);
$query->select($db->quoteName(array('a.id','a.system_name'),array('id','customadminview_system_name')));
$query->from($db->quoteName('#__componentbuilder_custom_admin_view', 'a'));
$query->where($db->quoteName('a.published') . ' >= 1');
$query->order('a.system_name ASC');
$db->setQuery((string)$query);
$items = $db->loadObjectList();
$options = [];
if ($items)
{
if ($this->multiple === false)
{
$options[] = Html::_('select.option', '', Text::_('COM_COMPONENTBUILDER_SELECT_AN_OPTION'));
}
foreach($items as $item)
{
$options[] = Html::_('select.option', $item->id, $item->customadminview_system_name);
}
}
return $options;
}
}

5
admin/src/Field/SiteviewfolderlistField.php
View File

@@ -17,6 +17,7 @@ use Joomla\CMS\HTML\HTMLHelper as Html;
use Joomla\CMS\Component\ComponentHelper;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
use VDM\Joomla\Utilities\StringHelper;
use Joomla\CMS\Filesystem\Folder;
// No direct access to this file
\defined('_JEXEC') or die;
@@ -52,7 +53,7 @@ class SiteviewfolderlistField extends ListField
// now check if there are files in the folder
foreach ($localfolders as $localfolder)
{
if (is_dir($localfolder) && $folders = \Joomla\Filesystem\Folder::folders($localfolder))
if (is_dir($localfolder) && $folders = Folder::folders($localfolder))
{
if ($this->multiple === false)
{
@@ -60,7 +61,7 @@ class SiteviewfolderlistField extends ListField
}
foreach ($folders as $folder)
{
$options[] = Html::_('select.option', $folder, StringHelper::safe($folder, 'W'));
$options[] = Html::_('select.option', StringHelper::safe($folder), StringHelper::safe($folder, 'W'));
}
}
}