joomla/Component-Builder
joomla
/
Component-Builder
38
19
Fork 11
Code Issues 52 Pull Requests Projects 3 Releases Wiki Activity

Fixed the file naming colution for the new filters. gh-378 Use the new select language string in filters.

This commit is contained in:
Llewellyn van der Merwe 2020-11-30 19:25:45 +02:00
parent 732521b3ab
commit bbee45ccab
Signed by: Llewellyn
GPG Key ID: EFC0C720A240551C
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/compiler/SD.txt
View File

@ -16,7 +16,7 @@
@author ###AUTHOR### <###AUTHORWEBSITE###>###CONTRIBUTORS### @author ###AUTHOR### <###AUTHORWEBSITE###>###CONTRIBUTORS###
@copyright ###COPYRIGHT### @copyright ###COPYRIGHT###
@license ###LICENSE### @license ###LICENSE###
###SHORT_DESCRIPTION### ###SHORT_DESCRIPTION###
/----------------------------------------------------------------------------------------------------------------------------------*/ /----------------------------------------------------------------------------------------------------------------------------------*/

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

@ -5038,7 +5038,7 @@ class Fields extends Structure
{ {
// this pains me... but to avoid collusion // this pains me... but to avoid collusion
$filter_type_code = ComponentbuilderHelper::safeString( $filter_type_code = ComponentbuilderHelper::safeString(
$name . $field['filter'] . $typeName $nameListCode . 'filter' . $name
); );
$filter_type_code = preg_replace('/_+/', '', $filter_type_code); $filter_type_code = preg_replace('/_+/', '', $filter_type_code);
$filter_function_name = ComponentbuilderHelper::safeString( $filter_function_name = ComponentbuilderHelper::safeString(

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

@ -17660,9 +17660,14 @@ class Interpretation extends Fields
. "protected function getThe" . $filter['function'] . "protected function getThe" . $filter['function']
. "Selections()"; . "Selections()";
$function[] = $this->_t(1) . "{"; $function[] = $this->_t(1) . "{";
$function[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
. " Get a db connection.";
}
else
{
$function[] = "//" . $this->setLine(__LINE__)
. " Get a db connection.";
} }
$function[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
. " Get a db connection.";
$function[] = $this->_t(2) . "\$db = JFactory::getDbo();"; $function[] = $this->_t(2) . "\$db = JFactory::getDbo();";
$function[] = PHP_EOL . $this->_t(2) . "//" $function[] = PHP_EOL . $this->_t(2) . "//"
. $this->setLine(__LINE__) . $this->setLine(__LINE__)
@ -17751,8 +17756,8 @@ class Interpretation extends Fields
if (!$funtion_path && $filter['multi'] == 1) if (!$funtion_path && $filter['multi'] == 1)
{ {
$function[] = $this->_t(3) $function[] = $this->_t(3)
. "\$_filter[] = JHtml::_('select.option', '', '- Select ' . JText:" . "\$_filter[] = JHtml::_('select.option', '', '- ' . JText:"
. ":_('" . $filter['lang'] . "') . ' -');"; . ":_('" . $filter['lang_select'] . "') . ' -');";
} }
$function[] = $this->_t(3) . "foreach (\$results as \$" $function[] = $this->_t(3) . "foreach (\$results as \$"
. $filter['code'] . ")"; . $filter['code'] . ")";