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

fixed greateUser logic to use the admin and site creation modes in correct way. Fixed language import issue that cause header mismatching. Added the option to add header values to the custom-custom fields.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2020-07-11 02:51:45 +02:00
parent a394638aff
commit 25afc31e7f
8 changed files with 63 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
admin/models/import.php
View File

@ -426,7 +426,15 @@ class ComponentbuilderModelImport extends JModelLegacy
$jinput = JFactory::getApplication()->input;
foreach($target_headers as $header)
{
$data['target_headers'][$header] = $jinput->getString($header, null);
if (($column = $jinput->getString($header, false)) !== false ||
($column = $jinput->getString(strtolower($header), false)) !== false)
{
$data['target_headers'][$header] = $column;
}
else
{
$data['target_headers'][$header] = null;
}
}
// set the data
if(isset($package['dir']))

16
admin/models/import_language_translations.php
View File

@ -424,7 +424,15 @@ class ComponentbuilderModelImport_language_translations extends JModelLegacy
$jinput = JFactory::getApplication()->input;
foreach($target_headers as $header)
{
$data['target_headers'][$header] = $jinput->getString(strtolower($header), null);
if (($column = $jinput->getString($header, false)) !== false ||
($column = $jinput->getString(strtolower($header), false)) !== false)
{
$data['target_headers'][$header] = $column;
}
else
{
$data['target_headers'][$header] = null;
}
}
// set the data
if(isset($package['dir']))
@ -463,10 +471,14 @@ class ComponentbuilderModelImport_language_translations extends JModelLegacy
{
$source_key = $data['target_headers']['Source'];
}
else
elseif (isset($data['target_headers']['English']))
{
$source_key = $data['target_headers']['English'];
}
else
{
$source_key = null;
}
// get the first array set
$firstSet = reset($data['array']);
// check if first array is a header array and remove if true