joomla/Component-Builder
40
26
Fork 12
Code Issues 80 Pull Requests 2 Projects 4 Wiki Activity

Release of v5.0.3-alpha3

Browse Source 
Fix usergrouplist compiler triggers. #1100. Add field type power integration [init, reset, push].
This commit is contained in:
Robot
2024-08-23 20:00:42 +02:00
parent 045e6df2e2
commit fc8fabe298
43 changed files with 1674 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/Builders.php
View File

@@ -1116,7 +1116,7 @@ final class Builders
break;
}
// just a heads-up for usergroups set to multiple
if ($typeName === 'usergroup')
if ($typeName === 'usergroup' || $typeName === 'usergrouplist')
{
$this->sitefielddata->set(
$nameSingleCode, $name, 'json', $typeName

2
libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/ConfigFieldsetsGroupControl.php
View File

@@ -138,7 +138,7 @@ final class ConfigFieldsetsGroupControl
{
$this->configfieldsets->add('component', Indent::_(2) . '<field name="'
. $selector . '"');
$this->configfieldsets->add('component', Indent::_(3) . 'type="usergroup"');
$this->configfieldsets->add('component', Indent::_(3) . 'type="usergrouplist"');
$this->configfieldsets->add('component', Indent::_(3) . 'label="' . $label . '"');
$this->configfieldsets->add('component', Indent::_(3) . 'description="'
. $lang . '_TARGET_GROUP_DESC"');

4
libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Field/Groups.php
View File

@@ -36,13 +36,13 @@ final class Groups
'color', 'combo', 'componentlayout', 'contentlanguage', 'contenttype', 'databaseconnection', 'components',
'editor', 'editors', 'email', 'file', 'file', 'filelist', 'folderlist', 'groupedlist', 'headertag', 'helpsite', 'hidden', 'imagelist',
'integer', 'language', 'list', 'media', 'menu', 'modal_menu', 'menuitem', 'meter', 'modulelayout', 'moduleorder', 'moduleposition',
'moduletag', 'note', 'number', 'password', 'plugins', 'predefinedlist', 'radio', 'range', 'repeatable', 'rules',
'moduletag', 'note', 'number', 'password', 'plugins', 'predefinedlist', 'radio', 'range', 'repeatable', 'rules', 'usergrouplist',
'sessionhandler', 'spacer', 'sql', 'subform', 'tag', 'tel', 'templatestyle', 'text', 'textarea', 'timezone', 'url', 'user', 'usergroup'
],
'plain' => [
'cachehandler', 'calendar', 'checkbox', 'chromestyle', 'color', 'componentlayout', 'contenttype', 'editor', 'editors', 'captcha',
'email', 'file', 'headertag', 'helpsite', 'hidden', 'integer', 'language', 'media', 'menu', 'modal_menu', 'menuitem', 'meter', 'modulelayout', 'templatestyle',
'moduleorder', 'moduletag', 'number', 'password', 'range', 'rules', 'tag', 'tel', 'text', 'textarea', 'timezone', 'url', 'user', 'usergroup'
'moduleorder', 'moduletag', 'number', 'password', 'range', 'rules', 'tag', 'tel', 'text', 'textarea', 'timezone', 'url', 'user', 'usergroup' , 'usergrouplist'
],
'option' => [
'accesslevel', 'category', 'checkboxes', 'combo', 'contentlanguage', 'databaseconnection', 'components',

10
libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php
View File

@@ -18062,7 +18062,7 @@ class Interpretation extends Fields
. "\$query = \$db->getQuery(true);";
// check if usergroup as we change to an object query
if ($filter['type'] === 'usergroup')
if ($filter['type'] === 'usergroup' || $filter['type'] === 'usergrouplist')
{
$function[] = PHP_EOL . Indent::_(2) . "//"
. Line::_(__Line__, __Class__) . " Select the text.";
@@ -18139,7 +18139,7 @@ class Interpretation extends Fields
. $nameListCode . "');";
}
// check if usergroup as we change to an object query
if ($filter['type'] !== 'usergroup')
if ($filter['type'] !== 'usergroup' && $filter['type'] !== 'usergrouplist')
{
$function[] = Indent::_(3)
. "\$_results = array_unique(\$_results);";
@@ -18197,7 +18197,7 @@ class Interpretation extends Fields
}
else
{
if ($filter['type'] === 'usergroup')
if ($filter['type'] === 'usergroup' || $filter['type'] === 'usergrouplist')
{
$function[] = Indent::_(4) . "//" . Line::_(
__LINE__,__CLASS__
@@ -20677,7 +20677,7 @@ class Interpretation extends Fields
break;
}
if ($item['type'] === 'usergroup' && !$export
if (($item['type'] === 'usergroup' || $item['type'] === 'usergrouplist') && !$export
&& $item['method'] != 6)
{
$fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "//"
@@ -20704,7 +20704,7 @@ class Interpretation extends Fields
. $item['name'] . "Names);";
$fix .= PHP_EOL . Indent::_(1) . $tab . Indent::_(3) . "}";
}
/* elseif ($item['type'] === 'usergroup' && $export)
/* elseif (($item['type'] === 'usergroup' || $item['type'] === 'usergrouplist') && $export)
{
$fix .= PHP_EOL.Indent::_(1).$tab.Indent::_(3) . "//".Line::_(__Line__, __Class__)." decode ".$item['name'];
$fix .= PHP_EOL.Indent::_(1).$tab.Indent::_(3) . "\$".$item['name']."Array = ".$decode."(\$item->".$item['name'].$suffix_decode.");";