joomla/Component-Builder
39
25
Fork 11
Code Issues 76 Pull Requests Projects 4 Wiki Activity

Release of v3.2.3-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:33:01 +02:00
parent fd08d48baf
commit c55fc67db4
56 changed files with 246 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/models/fields/adminsviews.php
View File

@ -39,7 +39,7 @@ class JFormFieldAdminsviews extends JFormFieldList
*/
protected function getOptions()
{
$db = JFactory::getDBO();
$db = Factory::getDBO();
$query = $db->getQuery(true);
$query->select($db->quoteName(array('a.id','a.system_name'),array('id','adminviews_system_name')));
$query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
@ -52,7 +52,7 @@ class JFormFieldAdminsviews extends JFormFieldList
{
foreach($items as $item)
{
$options[] = JHtml::_('select.option', $item->id, $item->adminviews_system_name);
$options[] = Html::_('select.option', $item->id, $item->adminviews_system_name);
}
}

5
admin/models/fields/adminviewfolderlist.php
View File

@ -16,6 +16,7 @@ use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\HTML\HTMLHelper as Html;
use VDM\Joomla\Utilities\StringHelper;
use Joomla\CMS\Filesystem\Folder;
// import the list field type
jimport('joomla.form.helper');
@ -49,7 +50,7 @@ class JFormFieldAdminviewfolderlist extends JFormFieldList
// 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)
{
@ -57,7 +58,7 @@ class JFormFieldAdminviewfolderlist extends JFormFieldList
}
foreach ($folders as $folder)
{
$options[] = Html::_('select.option', $folder, StringHelper::safe($folder, 'W'));
$options[] = Html::_('select.option', StringHelper::safe($folder), StringHelper::safe($folder, 'W'));
}
}
}

41
admin/models/fields/adminviews.php
View File

@ -39,24 +39,27 @@ class JFormFieldAdminviews extends JFormFieldList
*/
protected function getOptions()
{
$db = JFactory::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[] = JHtml::_('select.option', '', 'Select an option');
foreach($items as $item)
{
$options[] = JHtml::_('select.option', $item->id, $item->adminview_system_name);
}
}
return $options;
// 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 = [];
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/models/fields/customadminviews.php
View File

@ -39,23 +39,27 @@ class JFormFieldCustomadminviews extends JFormFieldList
*/
protected function getOptions()
{
$db = JFactory::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[] = JHtml::_('select.option', '', 'Select an option');
foreach($items as $item)
{
$options[] = JHtml::_('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/models/fields/siteviewfolderlist.php
View File

@ -16,6 +16,7 @@ use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\HTML\HTMLHelper as Html;
use VDM\Joomla\Utilities\StringHelper;
use Joomla\CMS\Filesystem\Folder;
// import the list field type
jimport('joomla.form.helper');
@ -49,7 +50,7 @@ class JFormFieldSiteviewfolderlist extends JFormFieldList
// 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)
{
@ -57,7 +58,7 @@ class JFormFieldSiteviewfolderlist extends JFormFieldList
}
foreach ($folders as $folder)
{
$options[] = Html::_('select.option', $folder, StringHelper::safe($folder, 'W'));
$options[] = Html::_('select.option', StringHelper::safe($folder), StringHelper::safe($folder, 'W'));
}
}
}