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

Release of v3.2.4-alpha3

Browse Source 
Fix usergrouplist compiler triggers. #1100.
This commit is contained in:
Robot
2024-08-23 18:12:51 +02:00
parent 209f625923
commit 6c2f52f59f
45 changed files with 1663 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
admin/models/forms/filter_help_documents.xml
View File

@ -73,10 +73,10 @@
<option value="a.type DESC">COM_COMPONENTBUILDER_FILTER_TYPE_DESCENDING</option>
<option value="a.location ASC">COM_COMPONENTBUILDER_FILTER_LOCATION_ASCENDING</option>
<option value="a.location DESC">COM_COMPONENTBUILDER_FILTER_LOCATION_DESCENDING</option>
<option value="h. ASC">COM_COMPONENTBUILDER_FILTER_ADMIN_VIEWS_ASCENDING</option>
<option value="h. DESC">COM_COMPONENTBUILDER_FILTER_ADMIN_VIEWS_DESCENDING</option>
<option value="i. ASC">COM_COMPONENTBUILDER_FILTER_SITE_VIEWS_ASCENDING</option>
<option value="i. DESC">COM_COMPONENTBUILDER_FILTER_SITE_VIEWS_DESCENDING</option>
<option value="g. ASC">COM_COMPONENTBUILDER_FILTER_ADMIN_VIEWS_ASCENDING</option>
<option value="g. DESC">COM_COMPONENTBUILDER_FILTER_ADMIN_VIEWS_DESCENDING</option>
<option value="h. ASC">COM_COMPONENTBUILDER_FILTER_SITE_VIEWS_ASCENDING</option>
<option value="h. DESC">COM_COMPONENTBUILDER_FILTER_SITE_VIEWS_DESCENDING</option>
<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
</field>

2
admin/models/forms/help_document.xml
View File

@ -115,7 +115,7 @@
<option value="3">
COM_COMPONENTBUILDER_HELP_DOCUMENT_URL</option>
</field>
<!-- Groups Field. Type: Usergrouplist. (custom) -->
<!-- Groups Field. Type: Usergrouplist. (joomla) -->
<field
type="usergrouplist"
name="groups"

2
admin/models/forms/repository.xml
View File

@ -155,6 +155,8 @@
COM_COMPONENTBUILDER_REPOSITORY_SUPER_POWER</option>
<option value="2">
COM_COMPONENTBUILDER_REPOSITORY_JOOMLA_POWER</option>
<option value="3">
COM_COMPONENTBUILDER_REPOSITORY_JOOMLA_FIELD_TYPE</option>
</field>
<!-- Type Field. Type: List. (joomla) -->
<field

16
admin/models/help_documents.php
View File

@ -21,7 +21,6 @@ use Joomla\Utilities\ArrayHelper;
use Joomla\CMS\Helper\TagsHelper;
use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
use VDM\Joomla\Utilities\ObjectHelper;
use VDM\Joomla\Utilities\JsonHelper;
use VDM\Joomla\Utilities\StringHelper;
/**
@ -166,8 +165,17 @@ class ComponentbuilderModelHelp_documents extends ListModel
continue;
}
// convert groups
$item->groups = JsonHelper::string($item->groups, ', ', 'groups');
// decode groups
$groupsArray = json_decode($item->groups, true);
if (UtilitiesArrayHelper::check($groupsArray))
{
$groupsNames = [];
foreach ($groupsArray as $groups)
{
$groupsNames[] = ComponentbuilderHelper::getGroupName($groups);
}
$item->groups = implode(', ', $groupsNames);
}
}
}
@ -266,7 +274,7 @@ class ComponentbuilderModelHelp_documents extends ListModel
else
{
$search = $db->quote('%' . $db->escape($search) . '%');
$query->where('(a.title LIKE '.$search.' OR a.type LIKE '.$search.' OR a.location LIKE '.$search.' OR a.admin_view LIKE '.$search.' OR h. LIKE '.$search.' OR a.site_view LIKE '.$search.' OR i. LIKE '.$search.')');
$query->where('(a.title LIKE '.$search.' OR a.type LIKE '.$search.' OR a.location LIKE '.$search.' OR a.admin_view LIKE '.$search.' OR g. LIKE '.$search.' OR a.site_view LIKE '.$search.' OR h. LIKE '.$search.')');
}
}

3
admin/models/repositories.php
View File

@ -199,7 +199,8 @@ class ComponentbuilderModelRepositories extends ListModel
$targetArray = array(
0 => 'COM_COMPONENTBUILDER_REPOSITORY_SELECT_AN_OPTION',
1 => 'COM_COMPONENTBUILDER_REPOSITORY_SUPER_POWER',
2 => 'COM_COMPONENTBUILDER_REPOSITORY_JOOMLA_POWER'
2 => 'COM_COMPONENTBUILDER_REPOSITORY_JOOMLA_POWER',
3 => 'COM_COMPONENTBUILDER_REPOSITORY_JOOMLA_FIELD_TYPE'
);
// Now check if value is found in this array
if (isset($targetArray[$value]) && StringHelper::check($targetArray[$value]))