joomla/Component-Builder
40
26
Fork 12
Code Issues 79 Pull Requests 2 Projects 4 Wiki Activity

Release of v4.0.1-alpha3

Browse Source 
Add in JCB gitea push feature to help maintain JCB core features. Add extending options to interfaces.
This commit is contained in:
Robot
2024-06-05 16:38:32 +02:00
parent 37c3a9a670
commit 4d544598e9
40 changed files with 1640 additions and 670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
admin/src/Model/PowerModel.php
View File

@@ -62,6 +62,8 @@ class PowerModel extends AdminModel
'description',
'extends',
'extends_custom',
'extendsinterfaces',
'extendsinterfaces_custom',
'implements',
'implements_custom',
'namespace',
@@ -87,6 +89,12 @@ class PowerModel extends AdminModel
'power_version'
)
),
'composer' => array(
'fullwidth' => array(
'autoload_composer_note',
'composer'
)
),
'licensing' => array(
'fullwidth' => array(
'add_licensing_template',
@@ -101,12 +109,6 @@ class PowerModel extends AdminModel
'right' => array(
'note_approved_paths'
)
),
'composer' => array(
'fullwidth' => array(
'autoload_composer_note',
'composer'
)
)
);
@@ -257,14 +259,6 @@ class PowerModel extends AdminModel
$item->main_class_code = base64_decode($item->main_class_code);
}
if (!empty($item->method_selection))
{
// Convert the method_selection field to an array.
$method_selection = new Registry;
$method_selection->loadString($item->method_selection);
$item->method_selection = $method_selection->toArray();
}
if (!empty($item->load_selection))
{
// Convert the load_selection field to an array.
@@ -281,6 +275,14 @@ class PowerModel extends AdminModel
$item->composer = $composer->toArray();
}
if (!empty($item->implements))
{
// Convert the implements field to an array.
$implements = new Registry;
$implements->loadString($item->implements);
$item->implements = $implements->toArray();
}
if (!empty($item->property_selection))
{
// Convert the property_selection field to an array.
@@ -289,12 +291,20 @@ class PowerModel extends AdminModel
$item->property_selection = $property_selection->toArray();
}
if (!empty($item->implements))
if (!empty($item->extendsinterfaces))
{
// Convert the implements field to an array.
$implements = new Registry;
$implements->loadString($item->implements);
$item->implements = $implements->toArray();
// Convert the extendsinterfaces field to an array.
$extendsinterfaces = new Registry;
$extendsinterfaces->loadString($item->extendsinterfaces);
$item->extendsinterfaces = $extendsinterfaces->toArray();
}
if (!empty($item->method_selection))
{
// Convert the method_selection field to an array.
$method_selection = new Registry;
$method_selection->loadString($item->method_selection);
$item->method_selection = $method_selection->toArray();
}
if (!empty($item->use_selection))
@@ -1145,19 +1155,6 @@ class PowerModel extends AdminModel
$data['guid'] = (string) GuidHelper::get();
}
// Set the method_selection items to data.
if (isset($data['method_selection']) && is_array($data['method_selection']))
{
$method_selection = new Registry;
$method_selection->loadArray($data['method_selection']);
$data['method_selection'] = (string) $method_selection;
}
elseif (!isset($data['method_selection']))
{
// Set the empty method_selection to data
$data['method_selection'] = '';
}
// Set the load_selection items to data.
if (isset($data['load_selection']) && is_array($data['load_selection']))
{
@@ -1184,6 +1181,19 @@ class PowerModel extends AdminModel
$data['composer'] = '';
}
// Set the implements items to data.
if (isset($data['implements']) && is_array($data['implements']))
{
$implements = new Registry;
$implements->loadArray($data['implements']);
$data['implements'] = (string) $implements;
}
elseif (!isset($data['implements']))
{
// Set the empty implements to data
$data['implements'] = '';
}
// Set the property_selection items to data.
if (isset($data['property_selection']) && is_array($data['property_selection']))
{
@@ -1197,17 +1207,30 @@ class PowerModel extends AdminModel
$data['property_selection'] = '';
}
// Set the implements items to data.
if (isset($data['implements']) && is_array($data['implements']))
// Set the extendsinterfaces items to data.
if (isset($data['extendsinterfaces']) && is_array($data['extendsinterfaces']))
{
$implements = new Registry;
$implements->loadArray($data['implements']);
$data['implements'] = (string) $implements;
$extendsinterfaces = new Registry;
$extendsinterfaces->loadArray($data['extendsinterfaces']);
$data['extendsinterfaces'] = (string) $extendsinterfaces;
}
elseif (!isset($data['implements']))
elseif (!isset($data['extendsinterfaces']))
{
// Set the empty implements to data
$data['implements'] = '';
// Set the empty extendsinterfaces to data
$data['extendsinterfaces'] = '';
}
// Set the method_selection items to data.
if (isset($data['method_selection']) && is_array($data['method_selection']))
{
$method_selection = new Registry;
$method_selection->loadArray($data['method_selection']);
$data['method_selection'] = (string) $method_selection;
}
elseif (!isset($data['method_selection']))
{
// Set the empty method_selection to data
$data['method_selection'] = '';
}
// Set the use_selection items to data.