Fixed gh-565 by removing the old PHPExcel_IOFactory and adding the new. Updated the subform layout for verious subforms in JCB for beter display. Change the helper category naming conventions for better integration with Joomla fields. gh-561

This commit is contained in:
2020-05-29 03:01:07 +02:00
parent 691aa81981
commit f2b2228dd7
50 changed files with 571 additions and 85 deletions

View File

@ -17,20 +17,20 @@ defined('_JEXEC') or die('Restricted access');
*/
//Insure this view category file is loaded.
$classname = 'ComponentbuilderFieldsCategories';
$classname = 'ComponentbuilderFieldCategories';
if (!class_exists($classname))
{
$path = JPATH_SITE . '/components/com_componentbuilder/helpers/categoryfields.php';
$path = JPATH_SITE . '/components/com_componentbuilder/helpers/categoryfield.php';
if (is_file($path))
{
include_once $path;
}
}
//Insure this view category file is loaded.
$classname = 'ComponentbuilderFieldtypesCategories';
$classname = 'ComponentbuilderFieldtypeCategories';
if (!class_exists($classname))
{
$path = JPATH_SITE . '/components/com_componentbuilder/helpers/categoryfieldtypes.php';
$path = JPATH_SITE . '/components/com_componentbuilder/helpers/categoryfieldtype.php';
if (is_file($path))
{
include_once $path;

View File

@ -15,7 +15,7 @@ defined('_JEXEC') or die('Restricted access');
/**
* Componentbuilder Field Component Category Tree
*/
class ComponentbuilderFieldsCategories extends JCategories
class ComponentbuilderFieldCategories extends JCategories
{
/**
* Class constructor
@ -26,7 +26,7 @@ class ComponentbuilderFieldsCategories extends JCategories
public function __construct($options = array())
{
$options['table'] = '#__componentbuilder_field';
$options['extension'] = 'com_componentbuilder.fields';
$options['extension'] = 'com_componentbuilder.field';
parent::__construct($options);
}

View File

@ -15,7 +15,7 @@ defined('_JEXEC') or die('Restricted access');
/**
* Componentbuilder Fieldtype Component Category Tree
*/
class ComponentbuilderFieldtypesCategories extends JCategories
class ComponentbuilderFieldtypeCategories extends JCategories
{
/**
* Class constructor
@ -26,7 +26,7 @@ class ComponentbuilderFieldtypesCategories extends JCategories
public function __construct($options = array())
{
$options['table'] = '#__componentbuilder_fieldtype';
$options['extension'] = 'com_componentbuilder.fieldtypes';
$options['extension'] = 'com_componentbuilder.fieldtype';
parent::__construct($options);
}