Adapted the custom buttons and layout in the components, admins and libraries views. Fixed a bug in the JCB package import that missed custom code imports when code is changed inside the custom code.
This commit is contained in:
@ -86,18 +86,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
|
||||
$item->metadata = $registry->toArray();
|
||||
}
|
||||
|
||||
if (!empty($item->php_import_save))
|
||||
{
|
||||
// base64 Decode php_import_save.
|
||||
$item->php_import_save = base64_decode($item->php_import_save);
|
||||
}
|
||||
|
||||
if (!empty($item->html_import_view))
|
||||
{
|
||||
// base64 Decode html_import_view.
|
||||
$item->html_import_view = base64_decode($item->html_import_view);
|
||||
}
|
||||
|
||||
if (!empty($item->php_import_save))
|
||||
{
|
||||
// base64 Decode php_import_save.
|
||||
$item->php_import_save = base64_decode($item->php_import_save);
|
||||
}
|
||||
|
||||
if (!empty($item->php_import_headers))
|
||||
{
|
||||
// base64 Decode php_import_headers.
|
||||
@ -326,14 +326,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
|
||||
$item->addlinked_views = $addlinked_views->toArray();
|
||||
}
|
||||
|
||||
if (!empty($item->alias_builder))
|
||||
{
|
||||
// Convert the alias_builder field to an array.
|
||||
$alias_builder = new Registry;
|
||||
$alias_builder->loadString($item->alias_builder);
|
||||
$item->alias_builder = $alias_builder->toArray();
|
||||
}
|
||||
|
||||
if (!empty($item->addtables))
|
||||
{
|
||||
// Convert the addtables field to an array.
|
||||
@ -342,6 +334,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
|
||||
$item->addtables = $addtables->toArray();
|
||||
}
|
||||
|
||||
if (!empty($item->alias_builder))
|
||||
{
|
||||
// Convert the alias_builder field to an array.
|
||||
$alias_builder = new Registry;
|
||||
$alias_builder->loadString($item->alias_builder);
|
||||
$item->alias_builder = $alias_builder->toArray();
|
||||
}
|
||||
|
||||
if (!empty($item->custom_button))
|
||||
{
|
||||
// Convert the custom_button field to an array.
|
||||
@ -1256,19 +1256,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
|
||||
$data['addlinked_views'] = '';
|
||||
}
|
||||
|
||||
// Set the alias_builder items to data.
|
||||
if (isset($data['alias_builder']) && is_array($data['alias_builder']))
|
||||
{
|
||||
$alias_builder = new JRegistry;
|
||||
$alias_builder->loadArray($data['alias_builder']);
|
||||
$data['alias_builder'] = (string) $alias_builder;
|
||||
}
|
||||
elseif (!isset($data['alias_builder']))
|
||||
{
|
||||
// Set the empty alias_builder to data
|
||||
$data['alias_builder'] = '';
|
||||
}
|
||||
|
||||
// Set the addtables items to data.
|
||||
if (isset($data['addtables']) && is_array($data['addtables']))
|
||||
{
|
||||
@ -1282,6 +1269,19 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
|
||||
$data['addtables'] = '';
|
||||
}
|
||||
|
||||
// Set the alias_builder items to data.
|
||||
if (isset($data['alias_builder']) && is_array($data['alias_builder']))
|
||||
{
|
||||
$alias_builder = new JRegistry;
|
||||
$alias_builder->loadArray($data['alias_builder']);
|
||||
$data['alias_builder'] = (string) $alias_builder;
|
||||
}
|
||||
elseif (!isset($data['alias_builder']))
|
||||
{
|
||||
// Set the empty alias_builder to data
|
||||
$data['alias_builder'] = '';
|
||||
}
|
||||
|
||||
// Set the custom_button items to data.
|
||||
if (isset($data['custom_button']) && is_array($data['custom_button']))
|
||||
{
|
||||
@ -1308,18 +1308,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
|
||||
$data['ajax_input'] = '';
|
||||
}
|
||||
|
||||
// Set the php_import_save string to base64 string.
|
||||
if (isset($data['php_import_save']))
|
||||
{
|
||||
$data['php_import_save'] = base64_encode($data['php_import_save']);
|
||||
}
|
||||
|
||||
// Set the html_import_view string to base64 string.
|
||||
if (isset($data['html_import_view']))
|
||||
{
|
||||
$data['html_import_view'] = base64_encode($data['html_import_view']);
|
||||
}
|
||||
|
||||
// Set the php_import_save string to base64 string.
|
||||
if (isset($data['php_import_save']))
|
||||
{
|
||||
$data['php_import_save'] = base64_encode($data['php_import_save']);
|
||||
}
|
||||
|
||||
// Set the php_import_headers string to base64 string.
|
||||
if (isset($data['php_import_headers']))
|
||||
{
|
||||
|
Reference in New Issue
Block a user