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

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

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2020-05-29 03:01:07 +02:00
parent 691aa81981
commit f2b2228dd7
50 changed files with 571 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
admin/helpers/compiler/e_Interpretation.php
View File

@ -17461,24 +17461,24 @@ class Interpretation extends Fields
}
// load the category helper details in not already loaded
if (!isset(
$this->fileContentDynamic['category' . $otherViews][$this->hhh
$this->fileContentDynamic['category' . $otherView][$this->hhh
. 'view' . $this->hhh]
))
{
// lets also set the category helper for this view
$target = array('site' => 'category' . $viewName_list);
$target = array('site' => 'category' . $otherView);
$this->buildDynamique($target, 'category');
// insure the file gets updated
$this->fileContentDynamic['category' . $otherViews][$this->hhh
$this->fileContentDynamic['category' . $otherView][$this->hhh
. 'view' . $this->hhh]
= $otherView;
$this->fileContentDynamic['category' . $otherViews][$this->hhh
$this->fileContentDynamic['category' . $otherView][$this->hhh
. 'View' . $this->hhh]
= ucfirst($otherView);
$this->fileContentDynamic['category' . $otherViews][$this->hhh
$this->fileContentDynamic['category' . $otherView][$this->hhh
. 'views' . $this->hhh]
= $otherViews;
$this->fileContentDynamic['category' . $otherViews][$this->hhh
$this->fileContentDynamic['category' . $otherView][$this->hhh
. 'Views' . $this->hhh]
= ucfirst($otherViews);
// set script to global helper file
@ -17486,12 +17486,12 @@ class Interpretation extends Fields
$includeHelper[] = "\n//" . $this->setLine(__LINE__)
. "Insure this view category file is loaded.";
$includeHelper[] = "\$classname = '" . ucfirst($component)
. ucfirst($viewName_list) . "Categories';";
. ucfirst($otherView) . "Categories';";
$includeHelper[] = "if (!class_exists(\$classname))";
$includeHelper[] = "{";
$includeHelper[] = $this->_t(1)
. "\$path = JPATH_SITE . '/components/com_" . $component
. "/helpers/category" . $viewName_list . ".php';";
. "/helpers/category" . $otherView . ".php';";
$includeHelper[] = $this->_t(1) . "if (is_file(\$path))";
$includeHelper[] = $this->_t(1) . "{";
$includeHelper[] = $this->_t(2) . "include_once \$path;";