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

Resolved gh-384 to enable category and any other field that inherit from the basic list type to be able to have options added.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2019-03-05 09:51:52 +02:00
parent 098c82c222
commit a5de53c5fa
8 changed files with 79 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
admin/helpers/compiler/a_Get.php
View File

@ -1992,17 +1992,24 @@ class Get
{
if (isset($view->{'add_' . $scripter}) && $view->{'add_' . $scripter} == 1 && ComponentbuilderHelper::checkString($view->$scripter))
{
$view->$scripter = $this->setDynamicValues(base64_decode($view->$scripter));
$view->{$scripter} = $this->setDynamicValues(base64_decode($view->{$scripter}));
$scripter_target = str_replace('javascript_', '', $scripter);
if (!isset($this->customScriptBuilder[$scripter_target][$name_single]))
if (!isset($this->customScriptBuilder[$scripter_target]) || !isset($this->customScriptBuilder[$scripter_target][$name_single]))
{
// check if the script is set
if (!isset($this->customScriptBuilder[$scripter_target]))
{
$this->customScriptBuilder[$scripter_target] = array();
}
$this->customScriptBuilder[$scripter_target][$name_single] = '';
// check if the script view is set
if (!isset($this->customScriptBuilder[$scripter_target][$name_single]))
{
$this->customScriptBuilder[$scripter_target][$name_single] = '';
}
}
$this->customScriptBuilder[$scripter_target][$name_single] .= PHP_EOL . $view->$scripter;
// load the script to class array
$this->customScriptBuilder[$scripter_target][$name_single] .= PHP_EOL . $view->{$scripter};
// check if a token must be set
if (strpos($view->$scripter, "token") !== false || strpos($view->$scripter, "task=ajax") !== false)
{
if (!$this->customScriptBuilder['token'][$name_single])
@ -2010,21 +2017,32 @@ class Get
$this->customScriptBuilder['token'][$name_single] = true;
}
}
unset($view->$scripter);
unset($view->{$scripter});
}
}
// add_css
$addArrayC = array('css_view', 'css_views');
foreach ($addArrayC as $scripter)
{
if (isset($view->{'add_' . $scripter}) && $view->{'add_' . $scripter} == 1)
if (isset($view->{'add_' . $scripter}) && $view->{'add_' . $scripter} == 1 && ComponentbuilderHelper::checkString($view->{$scripter}))
{
if (!isset($this->customScriptBuilder[$scripter][$name_single]))
$view->{$scripter} = $this->setDynamicValues(base64_decode($view->{$scripter}));
if (!isset($this->customScriptBuilder[$scripter]) || !isset($this->customScriptBuilder[$scripter][$name_single]))
{
$this->customScriptBuilder[$scripter][$name_single] = '';
// check if the script is set
if (!isset($this->customScriptBuilder[$scripter]))
{
$this->customScriptBuilder[$scripter] = array();
}
// check if the script view is set
if (!isset($this->customScriptBuilder[$scripter][$name_single]))
{
$this->customScriptBuilder[$scripter][$name_single] = '';
}
}
$this->customScriptBuilder[$scripter][$name_single] .= PHP_EOL . base64_decode($view->$scripter);
unset($view->$scripter);
// load the script to class array
$this->customScriptBuilder[$scripter][$name_single] .= PHP_EOL . $view->{$scripter};
unset($view->{$scripter});
}
}
// add_php

9
admin/helpers/compiler/c_Fields.php
View File

@ -1274,6 +1274,7 @@ class Fields extends Structure
}
}
}
// if options were found
if (ComponentbuilderHelper::checkString($optionSet))
{
$field .= '>';
@ -1281,16 +1282,17 @@ class Fields extends Structure
$field .= $optionSet;
$field .= PHP_EOL . $this->_t(2) . $taber . "</field>";
}
elseif ($typeName === 'sql')
// if no options found and must have a list of options
elseif (ComponentbuilderHelper::fieldCheck($typeName, 'list'))
{
$optionArray = false;
$field .= PHP_EOL . $this->_t(2) . $taber . "/>";
$field .= PHP_EOL . $this->_t(2) . $taber . "<!--" . $this->setLine(__LINE__) . " No Manual Options Were Added In Field Settings. -->" . PHP_EOL;
}
else
{
$optionArray = false;
$field .= PHP_EOL . $this->_t(2) . $taber . "/>";
$field .= PHP_EOL . $this->_t(2) . $taber . "<!--" . $this->setLine(__LINE__) . " No Manual Options Were Added In Field Settings. -->" . PHP_EOL;
}
}
elseif ($setType === 'plain')
@ -1663,7 +1665,8 @@ class Fields extends Structure
}
}
}
if (!$field->fieldXML->count())
// if no options found and must have a list of options
if (!$field->fieldXML->count() && ComponentbuilderHelper::fieldCheck($typeName, 'list'))
{
ComponentbuilderHelper::xmlComment($field->fieldXML, $this->setLine(__LINE__) . " No Manual Options Were Added In Field Settings.");
}