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

added interface of the new decoupled libraries concept gh-92

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-11-26 02:29:08 +02:00
parent 9760ac86a3
commit 82df61aa4a
174 changed files with 11626 additions and 1094 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
admin/models/custom_admin_view.php
View File

@ -79,7 +79,7 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
{
if ($item = parent::getItem($pk))
{
if (!empty($item->params))
if (!empty($item->params) && !is_array($item->params))
{
// Convert the params field to an array.
$registry = new Registry;
@ -95,12 +95,12 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->metadata = $registry->toArray();
}
if (!empty($item->custom_get))
if (!empty($item->libraries))
{
// Convert the custom_get field to an array.
$custom_get = new Registry;
$custom_get->loadString($item->custom_get);
$item->custom_get = $custom_get->toArray();
// Convert the libraries field to an array.
$libraries = new Registry;
$libraries->loadString($item->libraries);
$item->libraries = $libraries->toArray();
}
if (!empty($item->custom_button))
@ -111,6 +111,14 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$item->custom_button = $custom_button->toArray();
}
if (!empty($item->custom_get))
{
// Convert the custom_get field to an array.
$custom_get = new Registry;
$custom_get->loadString($item->custom_get);
$item->custom_get = $custom_get->toArray();
}
if (!empty($item->php_controller))
{
// base64 Decode php_controller.
@ -915,17 +923,17 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$data['metadata'] = (string) $metadata;
}
// Set the custom_get items to data.
if (isset($data['custom_get']) && is_array($data['custom_get']))
// Set the libraries items to data.
if (isset($data['libraries']) && is_array($data['libraries']))
{
$custom_get = new JRegistry;
$custom_get->loadArray($data['custom_get']);
$data['custom_get'] = (string) $custom_get;
$libraries = new JRegistry;
$libraries->loadArray($data['libraries']);
$data['libraries'] = (string) $libraries;
}
elseif (!isset($data['custom_get']))
elseif (!isset($data['libraries']))
{
// Set the empty custom_get to data
$data['custom_get'] = '';
// Set the empty libraries to data
$data['libraries'] = '';
}
// Set the custom_button items to data.
@ -941,6 +949,19 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
$data['custom_button'] = '';
}
// Set the custom_get items to data.
if (isset($data['custom_get']) && is_array($data['custom_get']))
{
$custom_get = new JRegistry;
$custom_get->loadArray($data['custom_get']);
$data['custom_get'] = (string) $custom_get;
}
elseif (!isset($data['custom_get']))
{
// Set the empty custom_get to data
$data['custom_get'] = '';
}
// Set the php_controller string to base64 string.
if (isset($data['php_controller']))
{