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

Fixed gh-262 that broke the saving of php values in custom field

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2018-04-13 22:06:45 +02:00
parent 04aefa256b
commit a0890ea87f
7 changed files with 23 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/models/field.php
View File

@ -903,8 +903,8 @@ class ComponentbuilderModelField extends JModelAdmin
// make sure we have the correct values
if (ComponentbuilderHelper::checkArray($property) && isset($property['name']) && ComponentbuilderHelper::checkString($property['name']) && isset($property['value']))
{
// fix the name
$property['name'] = ComponentbuilderHelper::safeString($property['name']);
// fix the name (TODO)
// $property['name'] = ComponentbuilderHelper::safeString($property['name']);
// some fixes, just in case (more can be added)
switch ($property['name'])
{

16
admin/models/fields/adminviewfolderlist.php
View File

@ -49,20 +49,6 @@ class JFormFieldAdminviewfolderlist extends JFormFieldList
*/
public function getOptions()
{
// get custom folder files
$localfolder = JPATH_COMPONENT_ADMINISTRATOR.'/views';
// set the default
$options = array();
// import all needed classes
jimport('joomla.filesystem.folder');
// now check if there are files in the folder
if (JFolder::exists($localfolder) && $folders = JFolder::folders($localfolder))
{
foreach ($folders as $folder)
{
$options[] = JHtml::_('select.option', $folder, ComponentbuilderHelper::safeString($folder, 'W'));
}
}
return $options;
return null;
}
}

16
admin/models/fields/siteviewfolderlist.php
View File

@ -49,20 +49,6 @@ class JFormFieldSiteviewfolderlist extends JFormFieldList
*/
public function getOptions()
{
// get custom folder files
$localfolder = JPATH_COMPONENT_SITE.'/views';
// set the default
$options = array();
// import all needed classes
jimport('joomla.filesystem.folder');
// now check if there are files in the folder
if (JFolder::exists($localfolder) && $folders = JFolder::folders($localfolder))
{
foreach ($folders as $folder)
{
$options[] = JHtml::_('select.option', $folder, ComponentbuilderHelper::safeString($folder, 'W'));
}
}
return $options;
return null;
}
}

5
admin/models/import_joomla_components.php
View File

@ -1378,6 +1378,11 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
{
unset($item->metakey);
}
// remove not_required
if (isset($item->not_required))
{
unset($item->not_required);
}
// actions to effect all
if (isset($item->asset_id))
{