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

Stable release of v3.2.0-beta1

Browse Source 
Move beta to main repo. Fix #1053 so that the right and left tabs display correctly in Joomla 4&5.
This commit is contained in:
Robot
2024-03-02 22:10:30 +02:00
parent 3c91a5cdbb
commit d1e1a56671
1786 changed files with 73608 additions and 37437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
admin/models/fields/dynamicdashboard.php
View File

@ -12,6 +12,14 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\HTML\HTMLHelper as Html;
use VDM\Joomla\Utilities\GetHelper;
use VDM\Joomla\Utilities\ArrayHelper;
use VDM\Joomla\Utilities\JsonHelper;
use VDM\Joomla\Utilities\StringHelper;
// import the list field type
jimport('joomla.form.helper');
JFormHelper::loadFieldClass('list');
@ -24,28 +32,28 @@ class JFormFieldDynamicdashboard extends JFormFieldList
/**
* The dynamicdashboard field type.
*
* @var string
* @var string
*/
public $type = 'dynamicdashboard';
/**
* Method to get a list of options for a list input.
*
* @return array An array of JHtml options.
* @return array An array of Html options.
*/
protected function getOptions()
{
// load the db opbject
$db = JFactory::getDBO();
$db = Factory::getDBO();
// get the input from url
$jinput = JFactory::getApplication()->input;
$jinput = Factory::getApplication()->input;
// get the id
$ID = $jinput->getInt('id', 0);
// set the targets
$targets = array('adminview' => 'admin_view', 'customadminview' => 'custom_admin_view');
$t = array('adminview' => 'A', 'customadminview' => 'C');
$targets = ['adminview' => 'admin_view', 'customadminview' => 'custom_admin_view'];
$t = ['adminview' => 'A', 'customadminview' => 'C'];
// rest the options
$options = array();
$options = [];
// reset the custom admin views array
$views = false;
if (is_numeric($ID) && $ID >= 1)
@ -53,7 +61,7 @@ class JFormFieldDynamicdashboard extends JFormFieldList
// get the linked back-end views
foreach ($targets as $target => $view)
{
if ($result = ComponentbuilderHelper::getVar('component_'.$view.'s', (int) $ID, 'joomla_component', 'add'.$view.'s'))
if ($result = GetHelper::var('component_'.$view.'s', (int) $ID, 'joomla_component', 'add'.$view.'s'))
{
$views[$target] = $result;
}
@ -62,28 +70,28 @@ class JFormFieldDynamicdashboard extends JFormFieldList
else
{
// not linked so there is none available
return array(JHtml::_('select.option', '', JText::_('COM_COMPONENTBUILDER_YOU_MUST_FIRST_LINK_AN_ADMIN_OR_A_CUSTOM_ADMIN_VIEW_TO_THIS_COMPONENT_THEN_YOU_CAN_SELECT_IT_HERE')));
return [Html::_('select.option', '', Text::_('COM_COMPONENTBUILDER_YOU_MUST_FIRST_LINK_AN_ADMIN_OR_A_CUSTOM_ADMIN_VIEW_TO_THIS_COMPONENT_THEN_YOU_CAN_SELECT_IT_HERE'))];
}
// check if we found any values
if (ComponentbuilderHelper::checkArray($views))
if (ArrayHelper::check($views))
{
foreach ($targets as $target => $view)
{
if (isset($views[$target]) && ComponentbuilderHelper::checkJson($views[$target]))
if (isset($views[$target]) && JsonHelper::check($views[$target]))
{
// convert to an array
$value = json_decode($views[$target], true);
$type = ComponentbuilderHelper::safeString($view, 'w');
if (ComponentbuilderHelper::checkArray($value))
$type = StringHelper::safe($view, 'w');
if (ArrayHelper::check($value))
{
foreach ($value as $_view)
{
if (isset($_view[$target]) && is_numeric($_view[$target]))
{
// set the view to the selections if found
if ($name = ComponentbuilderHelper::getVar($view, (int) $_view[$target], 'id', 'system_name'))
if ($name = GetHelper::var($view, (int) $_view[$target], 'id', 'system_name'))
{
$options[] = JHtml::_('select.option', $t[$target].'_'.$_view[$target], $name.' ['.$type.']');
$options[] = Html::_('select.option', $t[$target].'_'.$_view[$target], $name.' ['.$type.']');
}
}
}
@ -92,12 +100,12 @@ class JFormFieldDynamicdashboard extends JFormFieldList
}
}
// return found options
if (ComponentbuilderHelper::checkArray($options))
if (ArrayHelper::check($options))
{
array_unshift($options , JHtml::_('select.option', '', JText::_('COM_COMPONENTBUILDER_SELECT_AN_OPTION')));
array_unshift($options , Html::_('select.option', '', Text::_('COM_COMPONENTBUILDER_SELECT_AN_OPTION')));
return $options;
}
// not linked so there is none available
return array(JHtml::_('select.option', '', JText::_('COM_COMPONENTBUILDER_YOU_MUST_FIRST_LINK_AN_ADMIN_OR_A_CUSTOM_ADMIN_VIEW_TO_THIS_COMPONENT_THEN_YOU_CAN_SELECT_IT_HERE')));
return [Html::_('select.option', '', Text::_('COM_COMPONENTBUILDER_YOU_MUST_FIRST_LINK_AN_ADMIN_OR_A_CUSTOM_ADMIN_VIEW_TO_THIS_COMPONENT_THEN_YOU_CAN_SELECT_IT_HERE'))];
}
}