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

fixed gh-419 to correctly load the category filter (extention and view name)

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2019-06-07 16:59:27 +02:00
parent 4a878e32ef
commit 37d3f1425e
8 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10947,21 +10947,13 @@ class Interpretation extends Fields
return '';
}
public function setCategoryFilter($viewName_single, $viewName_list)
public function setCategoryFilter($viewName_list)
{
if (isset($this->categoryBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list]))
if (isset($this->categoryBuilder[$viewName_list])
&& ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list])
&& isset($this->categoryBuilder[$viewName_list]['extension']))
{
// check if category has another name
if (isset($this->catOtherName[$viewName_list]) && ComponentbuilderHelper::checkArray($this->catOtherName[$viewName_list]))
{
$targetView = "." . $this->catOtherName[$viewName_list]['view'];
}
else
{
$targetView = "." . $viewName_single;
}
// set component name
$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
$COPMONENT = ComponentbuilderHelper::safeString($this->componentData->name_code, 'U');
// set filter
$filter = array();
@ -10969,7 +10961,7 @@ class Interpretation extends Fields
$filter[] = $this->_t(2) . "JHtmlSidebar::addFilter(";
$filter[] = $this->_t(3) . "JText:" . ":_('JOPTION_SELECT_CATEGORY'),";
$filter[] = $this->_t(3) . "'filter_category_id',";
$filter[] = $this->_t(3) . "JHtml::_('select.options', JHtml::_('category.options', 'com_" . $component . $targetView . "'), 'value', 'text', \$this->state->get('filter.category_id'))";
$filter[] = $this->_t(3) . "JHtml::_('select.options', JHtml::_('category.options', '" . $this->categoryBuilder[$viewName_list]['extension'] . "'), 'value', 'text', \$this->state->get('filter.category_id'))";
$filter[] = $this->_t(2) . ");";
@ -10979,7 +10971,7 @@ class Interpretation extends Fields
$filter[] = $this->_t(3) . "JHtmlBatch_::addListSelection(";
$filter[] = $this->_t(4) . "JText:" . ":_('COM_" . $COPMONENT . "_KEEP_ORIGINAL_CATEGORY'),";
$filter[] = $this->_t(4) . "'batch[category]',";
$filter[] = $this->_t(4) . "JHtml::_('select.options', JHtml::_('category.options', 'com_" . $component . $targetView . "'), 'value', 'text')";
$filter[] = $this->_t(4) . "JHtml::_('select.options', JHtml::_('category.options', '" . $this->categoryBuilder[$viewName_list]['extension'] . "'), 'value', 'text')";
$filter[] = $this->_t(3) . ");";
$filter[] = $this->_t(2) . "}";