From c75883fb8f2ee263edb1af3121de79ffe8d76dd1 Mon Sep 17 00:00:00 2001 From: aB0t Date: Mon, 30 Sep 2024 01:57:29 +0200 Subject: [PATCH] Release of v3.2.5-alpha1 Add [AllowDynamicProperties] in the base view class for J5. Move the _prepareDocument above the display call in the base view class. --- CHANGELOG.md | 5 ++ README.md | 10 +-- admin/README.txt | 10 +-- .../joomla_3/HtmlView_custom_admin.php | 3 + admin/compiler/joomla_3/HtmlView_edit.php | 6 +- .../compiler/joomla_3/HtmlView_edit_site.php | 6 +- admin/compiler/joomla_3/HtmlView_list.php | 6 +- .../joomla_3/HtmlView_list_custom_admin.php | 3 + .../compiler/joomla_3/HtmlView_list_site.php | 3 + admin/compiler/joomla_3/HtmlView_site.php | 3 + admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php | 1 + admin/compiler/joomla_4/ADMIN_VIEW_HTML.php | 1 + .../joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php | 3 + .../joomla_4/CUSTOM_ADMIN_VIEWS_MODEL.php | 7 +- .../joomla_4/CUSTOM_ADMIN_VIEW_HTML.php | 3 + .../joomla_4/CUSTOM_ADMIN_VIEW_MODEL.php | 4 +- admin/compiler/joomla_4/DASH_VIEW_HTML.php | 1 + admin/compiler/joomla_4/SITE_VIEWS_HTML.php | 2 + admin/compiler/joomla_4/SITE_VIEW_HTML.php | 2 + admin/layouts/trashhelper.php | 20 ++--- admin/models/forms/admin_view.xml | 1 + admin/sql/install.mysql.utf8.sql | 2 +- admin/sql/updates/mysql/3.2.4.sql | 1 + admin/views/admin_custom_tabs/view.html.php | 6 +- admin/views/admin_fields/view.html.php | 6 +- .../admin_fields_conditions/view.html.php | 6 +- .../admin_fields_relations/view.html.php | 6 +- admin/views/admin_view/view.html.php | 6 +- admin/views/admin_views/view.html.php | 6 +- admin/views/admins_custom_tabs/view.html.php | 6 +- admin/views/admins_fields/view.html.php | 6 +- .../admins_fields_conditions/view.html.php | 6 +- .../admins_fields_relations/view.html.php | 6 +- admin/views/class_extendings/view.html.php | 6 +- admin/views/class_extends/view.html.php | 6 +- admin/views/class_method/view.html.php | 6 +- admin/views/class_methods/view.html.php | 6 +- admin/views/class_properties/view.html.php | 6 +- admin/views/class_property/view.html.php | 6 +- admin/views/compiler/view.html.php | 1 + .../views/component_admin_views/view.html.php | 6 +- admin/views/component_config/view.html.php | 6 +- .../view.html.php | 6 +- .../view.html.php | 6 +- admin/views/component_dashboard/view.html.php | 6 +- .../component_files_folders/view.html.php | 6 +- admin/views/component_modules/view.html.php | 6 +- .../component_mysql_tweaks/view.html.php | 6 +- .../component_placeholders/view.html.php | 6 +- admin/views/component_plugins/view.html.php | 6 +- admin/views/component_router/view.html.php | 6 +- .../views/component_site_views/view.html.php | 6 +- admin/views/component_updates/view.html.php | 6 +- .../components_admin_views/view.html.php | 6 +- admin/views/components_config/view.html.php | 6 +- .../view.html.php | 6 +- .../view.html.php | 6 +- .../views/components_dashboard/view.html.php | 6 +- .../components_files_folders/view.html.php | 6 +- admin/views/components_modules/view.html.php | 6 +- .../components_mysql_tweaks/view.html.php | 6 +- .../components_placeholders/view.html.php | 6 +- admin/views/components_plugins/view.html.php | 6 +- admin/views/components_routers/view.html.php | 6 +- .../views/components_site_views/view.html.php | 6 +- admin/views/components_updates/view.html.php | 6 +- admin/views/custom_admin_view/view.html.php | 6 +- admin/views/custom_admin_views/view.html.php | 6 +- admin/views/custom_code/view.html.php | 6 +- admin/views/custom_codes/view.html.php | 6 +- admin/views/dynamic_get/view.html.php | 6 +- admin/views/dynamic_gets/view.html.php | 6 +- admin/views/field/view.html.php | 6 +- admin/views/fields/view.html.php | 6 +- admin/views/fieldtype/view.html.php | 6 +- admin/views/fieldtypes/view.html.php | 6 +- admin/views/get_snippets/view.html.php | 1 + admin/views/help_document/view.html.php | 6 +- admin/views/help_documents/view.html.php | 6 +- admin/views/joomla_component/view.html.php | 6 +- admin/views/joomla_components/view.html.php | 6 +- admin/views/joomla_module/view.html.php | 6 +- .../view.html.php | 6 +- .../views/joomla_module_updates/view.html.php | 6 +- admin/views/joomla_modules/view.html.php | 6 +- .../view.html.php | 6 +- .../joomla_modules_updates/view.html.php | 6 +- admin/views/joomla_plugin/view.html.php | 6 +- .../view.html.php | 6 +- admin/views/joomla_plugin_group/view.html.php | 6 +- .../views/joomla_plugin_groups/view.html.php | 6 +- .../views/joomla_plugin_updates/view.html.php | 6 +- admin/views/joomla_plugins/view.html.php | 6 +- .../view.html.php | 6 +- .../joomla_plugins_updates/view.html.php | 6 +- admin/views/joomla_power/view.html.php | 6 +- admin/views/joomla_powers/view.html.php | 6 +- admin/views/language/view.html.php | 6 +- .../views/language_translation/view.html.php | 6 +- .../views/language_translations/view.html.php | 6 +- admin/views/languages/view.html.php | 6 +- admin/views/layout/view.html.php | 6 +- admin/views/layouts/view.html.php | 6 +- admin/views/libraries/view.html.php | 6 +- admin/views/libraries_config/view.html.php | 6 +- .../view.html.php | 6 +- admin/views/library/view.html.php | 6 +- admin/views/library_config/view.html.php | 6 +- .../library_files_folders_urls/view.html.php | 6 +- admin/views/placeholder/view.html.php | 6 +- admin/views/placeholders/view.html.php | 6 +- admin/views/power/view.html.php | 6 +- admin/views/powers/view.html.php | 6 +- admin/views/repositories/view.html.php | 6 +- admin/views/repository/view.html.php | 6 +- admin/views/search/view.html.php | 1 + admin/views/server/view.html.php | 6 +- admin/views/servers/view.html.php | 6 +- admin/views/site_view/view.html.php | 6 +- admin/views/site_views/view.html.php | 6 +- admin/views/snippet/view.html.php | 6 +- admin/views/snippet_type/view.html.php | 6 +- admin/views/snippet_types/view.html.php | 6 +- admin/views/snippets/view.html.php | 6 +- admin/views/template/view.html.php | 6 +- admin/views/templates/view.html.php | 6 +- admin/views/validation_rule/view.html.php | 6 +- admin/views/validation_rules/view.html.php | 6 +- componentbuilder.xml | 6 +- componentbuilder_update_server.xml | 18 ++++ .../VDM.Joomla.Gitea/src/Factory.php | 8 ++ .../VDM.Joomla.Openai/src/Factory.php | 8 ++ .../VDM.Joomla/src/Abstraction/Factory.php | 8 -- .../VDM.Joomla/src/Abstraction/Schema.php | 89 ++++++++++++++----- .../src/Componentbuilder/Compiler/Factory.php | 8 ++ .../Compiler/Helper/Interpretation.php | 2 - .../Componentbuilder/Fieldtype/Factory.php | 8 ++ .../Componentbuilder/JoomlaPower/Factory.php | 8 ++ .../src/Componentbuilder/Package/Factory.php | 8 ++ .../src/Componentbuilder/Power/Factory.php | 8 ++ .../src/Componentbuilder/Search/Factory.php | 8 ++ .../VDM.Joomla/src/Data/Factory.php | 8 ++ .../VDM.Joomla/src/Data/MultiSubform.php | 46 ++++++++++ script.php | 2 +- site/views/api/view.html.php | 1 + 145 files changed, 584 insertions(+), 378 deletions(-) create mode 100644 admin/sql/updates/mysql/3.2.4.sql diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ee0c3f69..21d8a23fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# v3.2.5-alpha1 + +- Add [AllowDynamicProperties] in the base view class for J5 +- Move the _prepareDocument above the display call in the base view class + # v3.2.4 - Add [push] option to Powers area. diff --git a/README.md b/README.md index 1af8bd8c0..ade7717fa 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.4) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.5-alpha1) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -144,13 +144,13 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 20th September, 2024 -+ *Version*: 3.2.4 ++ *Last Build*: 29th September, 2024 ++ *Version*: 3.2.5-alpha1 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **851089** ++ *Line count*: **853809** + *Field count*: **2098** -+ *File count*: **5786** ++ *File count*: **5807** + *Folder count*: **505** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com). diff --git a/admin/README.txt b/admin/README.txt index 1af8bd8c0..ade7717fa 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.4) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (3.2.5-alpha1) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -144,13 +144,13 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 20th September, 2024 -+ *Version*: 3.2.4 ++ *Last Build*: 29th September, 2024 ++ *Version*: 3.2.5-alpha1 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **851089** ++ *Line count*: **853809** + *Field count*: **2098** -+ *File count*: **5786** ++ *File count*: **5807** + *Folder count*: **505** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com). diff --git a/admin/compiler/joomla_3/HtmlView_custom_admin.php b/admin/compiler/joomla_3/HtmlView_custom_admin.php index dc0f06ed4..ebb2ef8a7 100644 --- a/admin/compiler/joomla_3/HtmlView_custom_admin.php +++ b/admin/compiler/joomla_3/HtmlView_custom_admin.php @@ -35,6 +35,9 @@ class ###Component###View###SView### extends HtmlView $this->user = Factory::getUser(); // get global action permissions $this->canDo = ###Component###Helper::getActions('###sview###');###CUSTOM_ADMIN_DIPLAY_METHOD### + + // Display the template + parent::display($tpl); }###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS### /** diff --git a/admin/compiler/joomla_3/HtmlView_edit.php b/admin/compiler/joomla_3/HtmlView_edit.php index a0c3431a5..eb12a0165 100644 --- a/admin/compiler/joomla_3/HtmlView_edit.php +++ b/admin/compiler/joomla_3/HtmlView_edit.php @@ -72,11 +72,11 @@ class ###Component###View###View### extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/compiler/joomla_3/HtmlView_edit_site.php b/admin/compiler/joomla_3/HtmlView_edit_site.php index 070fde9f5..99c3b9875 100644 --- a/admin/compiler/joomla_3/HtmlView_edit_site.php +++ b/admin/compiler/joomla_3/HtmlView_edit_site.php @@ -72,11 +72,11 @@ class ###Component###View###View### extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/compiler/joomla_3/HtmlView_list.php b/admin/compiler/joomla_3/HtmlView_list.php index f00898087..e6371926c 100644 --- a/admin/compiler/joomla_3/HtmlView_list.php +++ b/admin/compiler/joomla_3/HtmlView_list.php @@ -65,11 +65,11 @@ class ###Component###View###Views### extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/compiler/joomla_3/HtmlView_list_custom_admin.php b/admin/compiler/joomla_3/HtmlView_list_custom_admin.php index ebea61327..6752ca0ee 100644 --- a/admin/compiler/joomla_3/HtmlView_list_custom_admin.php +++ b/admin/compiler/joomla_3/HtmlView_list_custom_admin.php @@ -35,6 +35,9 @@ class ###Component###View###SViews### extends HtmlView $this->user = Factory::getUser(); // get global action permissions $this->canDo = ###Component###Helper::getActions('###sview###');###CUSTOM_ADMIN_DIPLAY_METHOD### + + // Display the template + parent::display($tpl); }###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS### /** diff --git a/admin/compiler/joomla_3/HtmlView_list_site.php b/admin/compiler/joomla_3/HtmlView_list_site.php index 424a6acae..7eb9e0536 100644 --- a/admin/compiler/joomla_3/HtmlView_list_site.php +++ b/admin/compiler/joomla_3/HtmlView_list_site.php @@ -33,6 +33,9 @@ class ###Component###View###SViews### extends HtmlView $this->menu = $this->app->getMenu()->getActive(); // get the user object $this->user = Factory::getUser();###SITE_DIPLAY_METHOD### + + // Display the template + parent::display($tpl); }###SITE_EXTRA_DIPLAY_METHODS### /** diff --git a/admin/compiler/joomla_3/HtmlView_site.php b/admin/compiler/joomla_3/HtmlView_site.php index 5c4ca5ecd..b66f5f394 100644 --- a/admin/compiler/joomla_3/HtmlView_site.php +++ b/admin/compiler/joomla_3/HtmlView_site.php @@ -33,6 +33,9 @@ class ###Component###View###SView### extends HtmlView $this->menu = $this->app->getMenu()->getActive(); // get the user object $this->user = Factory::getUser();###SITE_DIPLAY_METHOD### + + // Display the template + parent::display($tpl); }###SITE_EXTRA_DIPLAY_METHODS### /** diff --git a/admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php b/admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php index c117fa8ae..94e6fd359 100644 --- a/admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php +++ b/admin/compiler/joomla_4/ADMIN_VIEWS_HTML.php @@ -25,6 +25,7 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator * * @since 1.6 */ +#[AllowDynamicProperties] class HtmlView extends BaseHtmlView { /** diff --git a/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php b/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php index 51966d554..7dd658664 100644 --- a/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php +++ b/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php @@ -25,6 +25,7 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator * * @since 1.6 */ +#[AllowDynamicProperties] class HtmlView extends BaseHtmlView { /** diff --git a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php index 96faeed38..6257cfd58 100644 --- a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php +++ b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_HTML.php @@ -25,6 +25,7 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator * * @since 1.6 */ +#[AllowDynamicProperties] class HtmlView extends BaseHtmlView { /** @@ -82,6 +83,8 @@ class HtmlView extends BaseHtmlView // Set the html view document stuff $this->_prepareDocument(); + + parent::display($tpl); }###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS### /** diff --git a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_MODEL.php b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_MODEL.php index 584eb6b38..bfa9f8e64 100644 --- a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_MODEL.php +++ b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEWS_MODEL.php @@ -105,9 +105,12 @@ class ###SViews###Model extends ListModel ]; /** - * A custom property for UIKit components. (not used unless you load v2) + * A custom property for UI Kit components. + * + * @var mixed Property for storing UI Kit component-related data or objects. + * @since 3.2.0 */ - protected $uikitComp; + protected $uikitComp = []; /** * Constructor diff --git a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_HTML.php b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_HTML.php index 6fe4459f2..748ca2454 100644 --- a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_HTML.php +++ b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_HTML.php @@ -25,6 +25,7 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator * * @since 1.6 */ +#[AllowDynamicProperties] class HtmlView extends BaseHtmlView { /** @@ -50,6 +51,8 @@ class HtmlView extends BaseHtmlView // Set the html view document stuff $this->_prepareDocument(); + + parent::display($tpl); }###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS### /** diff --git a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_MODEL.php b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_MODEL.php index f71b26864..dc935fd94 100644 --- a/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_MODEL.php +++ b/admin/compiler/joomla_4/CUSTOM_ADMIN_VIEW_MODEL.php @@ -115,10 +115,10 @@ class ###SView###Model extends ItemModel /** * A custom property for UI Kit components. * - * @var array|null Property for storing UI Kit component-related data or objects. + * @var mixed Property for storing UI Kit component-related data or objects. * @since 3.2.0 */ - protected ?array $uikitComp; + protected $uikitComp = []; /** * @var object item diff --git a/admin/compiler/joomla_4/DASH_VIEW_HTML.php b/admin/compiler/joomla_4/DASH_VIEW_HTML.php index db91cf460..e25b5dc4f 100644 --- a/admin/compiler/joomla_4/DASH_VIEW_HTML.php +++ b/admin/compiler/joomla_4/DASH_VIEW_HTML.php @@ -25,6 +25,7 @@ namespace ###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator * * @since 1.6 */ +#[AllowDynamicProperties] class HtmlView extends BaseHtmlView { /** diff --git a/admin/compiler/joomla_4/SITE_VIEWS_HTML.php b/admin/compiler/joomla_4/SITE_VIEWS_HTML.php index a01ccbb92..2776f8bc2 100644 --- a/admin/compiler/joomla_4/SITE_VIEWS_HTML.php +++ b/admin/compiler/joomla_4/SITE_VIEWS_HTML.php @@ -93,6 +93,8 @@ class HtmlView extends BaseHtmlView $this->scripts = $this->get('Scripts'); // get the user object $this->user ??= $this->app->getIdentity();###SITE_DIPLAY_METHOD### + + parent::display($tpl); }###SITE_EXTRA_DIPLAY_METHODS### /** diff --git a/admin/compiler/joomla_4/SITE_VIEW_HTML.php b/admin/compiler/joomla_4/SITE_VIEW_HTML.php index 375cf05a0..88b335bfd 100644 --- a/admin/compiler/joomla_4/SITE_VIEW_HTML.php +++ b/admin/compiler/joomla_4/SITE_VIEW_HTML.php @@ -77,6 +77,8 @@ class HtmlView extends BaseHtmlView $this->scripts = $this->get('Scripts') ?? []; // get the user object $this->user ??= $this->getCurrentUser();###SITE_DIPLAY_METHOD### + + parent::display($tpl); }###SITE_EXTRA_DIPLAY_METHODS### /** diff --git a/admin/layouts/trashhelper.php b/admin/layouts/trashhelper.php index ffac982d1..0dc4fdd34 100644 --- a/admin/layouts/trashhelper.php +++ b/admin/layouts/trashhelper.php @@ -31,16 +31,16 @@ use Joomla\CMS\Layout\LayoutHelper; document.adminForm.elements['checkall-toggle'].checked=1; Joomla.checkAll(document.adminForm.elements['checkall-toggle']); // check to confirm the deletion - if(confirm('')) { - Joomla.submitbutton('get("name") ?>.delete'); + if(confirm('')) { + Joomla.submitbutton('getName(); ?>.delete'); } else { document.adminForm.elements['checkall-toggle'].checked=0; Joomla.checkAll(document.adminForm.elements['checkall-toggle']); } } else { // confirm deletion of those selected - if (confirm('')) { - Joomla.submitbutton('get("name") ?>.delete'); + if (confirm('')) { + Joomla.submitbutton('getName(); ?>.delete'); }; } return false; @@ -56,23 +56,23 @@ use Joomla\CMS\Layout\LayoutHelper; items)): ?>

- +

-

+

- +

-

+

diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index 900db96e4..e7c765e2a 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -2470,6 +2470,7 @@ name="table" label="COM_COMPONENTBUILDER_ADMIN_VIEW_TABLE_LABEL" class="list_class" + layout="joomla.form.field.list-fancy-select" multiple="false" default="0" button="false" diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index b1abad1bf..18e5316b9 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -2118,7 +2118,7 @@ INSERT INTO `#__componentbuilder_site_view` (`id`, `add_css_document`, `add_css` -- INSERT INTO `#__componentbuilder_layout` (`id`, `add_php_view`, `alias`, `description`, `dynamic_get`, `layout`, `name`, `php_view`, `snippet`, `params`, `published`, `version`, `hits`, `ordering`, `libraries`) VALUES -(97, '', 'trashhelper', 'Trash Helper Layout', '', 'PD9waHAgaWYgKCRkaXNwbGF5RGF0YS0+c3RhdGUtPmdldCgnZmlsdGVyLnB1Ymxpc2hlZCcpID09IC0yICYmICgkZGlzcGxheURhdGEtPmNhblN0YXRlICYmICRkaXNwbGF5RGF0YS0+Y2FuRGVsZXRlKSkgOiA/Pg0KCTxzY3JpcHQ+DQoJCS8vIGNoYW5nZSB0aGUgY2xhc3Mgb2YgdGhlIGRlbGV0ZSBidXR0b24NCgkJalF1ZXJ5KCIjdG9vbGJhci1kZWxldGUgYnV0dG9uIikudG9nZ2xlQ2xhc3MoImJ0bi1kYW5nZXIiKTsNCgkJLy8gZnVuY3Rpb24gdG8gZW1wdHkgdGhlIHRyYXNoDQoJCWZ1bmN0aW9uIGVtcHR5VHJhc2goKSB7DQoJCQlpZiAoZG9jdW1lbnQuYWRtaW5Gb3JtLmJveGNoZWNrZWQudmFsdWUgPT0gMCkgew0KCQkJCS8vIHNlbGVjdCBhbGwgdGhlIGl0ZW1zIHZpc2FibGUNCgkJCQlkb2N1bWVudC5hZG1pbkZvcm0uZWxlbWVudHNbJ2NoZWNrYWxsLXRvZ2dsZSddLmNoZWNrZWQ9MTsNCgkJCQlKb29tbGEuY2hlY2tBbGwoZG9jdW1lbnQuYWRtaW5Gb3JtLmVsZW1lbnRzWydjaGVja2FsbC10b2dnbGUnXSk7DQoJCQkJLy8gY2hlY2sgdG8gY29uZmlybSB0aGUgZGVsZXRpb24NCgkJCQlpZihjb25maXJtKCc8Pz0gVGV4dDo6XygiQXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIGRlbGV0ZT8gQ29uZmlybWluZyB3aWxsIHBlcm1hbmVudGx5IGRlbGV0ZSB0aGUgc2VsZWN0ZWQgaXRlbShzKSEiKSA/PicpKSB7DQoJCQkJCUpvb21sYS5zdWJtaXRidXR0b24oJzw/PSAkZGlzcGxheURhdGEtPmdldCgibmFtZSIpID8+LmRlbGV0ZScpOw0KCQkJCX0gZWxzZSB7DQoJCQkJCWRvY3VtZW50LmFkbWluRm9ybS5lbGVtZW50c1snY2hlY2thbGwtdG9nZ2xlJ10uY2hlY2tlZD0wOw0KCQkJCQlKb29tbGEuY2hlY2tBbGwoZG9jdW1lbnQuYWRtaW5Gb3JtLmVsZW1lbnRzWydjaGVja2FsbC10b2dnbGUnXSk7DQoJCQkJfQ0KCQkJfSBlbHNlIHsNCgkJCQkvLyBjb25maXJtIGRlbGV0aW9uIG9mIHRob3NlIHNlbGVjdGVkDQoJCQkJaWYgKGNvbmZpcm0oJzw/PSBUZXh0OjpfKCJBcmUgeW91IHN1cmUgeW91IHdhbnQgdG8gZGVsZXRlPyBDb25maXJtaW5nIHdpbGwgcGVybWFuZW50bHkgZGVsZXRlIHRoZSBzZWxlY3RlZCBpdGVtKHMpISIpID8+JykpIHsNCgkJCQkJSm9vbWxhLnN1Ym1pdGJ1dHRvbignPD89ICRkaXNwbGF5RGF0YS0+Z2V0KCJuYW1lIikgPz4uZGVsZXRlJyk7DQoJCQkJfTsNCgkJCX0NCgkJCXJldHVybiBmYWxzZTsNCgkJfQ0KCQkvLyBmdW5jdGlvbiB0byBleGl0IHRoZSB0YXNoIHN0YXRlDQoJCWZ1bmN0aW9uIGV4aXRUcmFzaCgpIHsNCgkJCWRvY3VtZW50LmFkbWluRm9ybS5maWx0ZXJfcHVibGlzaGVkLnNlbGVjdGVkSW5kZXggPSAwOw0KCQkJZG9jdW1lbnQuYWRtaW5Gb3JtLnN1Ym1pdCgpOw0KCQkJcmV0dXJuIGZhbHNlOw0KCQl9DQoJPC9zY3JpcHQ+DQoJPGRpdiBjbGFzcz0iYWxlcnQgYWxlcnQtZXJyb3IiPg0KCQk8P3BocCBpZiAoZW1wdHkoJGRpc3BsYXlEYXRhLT5pdGVtcykpOiA/Pg0KCQkJPGg0IGNsYXNzPSJhbGVydC1oZWFkaW5nIj4NCgkJCQk8c3BhbiBjbGFzcz0iaWNvbi10cmFzaCI+PC9zcGFuPg0KCQkJCTw/PSBUZXh0OjpfKCJUcmFzaCBBcmVhIikgPz4NCgkJCTwvaDQ+DQoJCQk8cD48Pz0gVGV4dDo6XygiWW91IGFyZSBjdXJyZW50bHkgdmlld2luZyB0aGUgdHJhc2ggYXJlYSwgYW5kIHlvdSBkb24ndCBoYXZlIGFueSBpdGVtcyBpbiB0cmFzaCBhdCB0aGUgbW9tZW50ISIpID8+PC9wPg0KCQk8P3BocCBlbHNlOiA/Pg0KCQkJPGg0IGNsYXNzPSJhbGVydC1oZWFkaW5nIj4NCgkJCQk8c3BhbiBjbGFzcz0iaWNvbi10cmFzaCI+PC9zcGFuPg0KCQkJCTw/PSBUZXh0OjpfKCJUcmFzaGVkIGl0ZW1zIikgPz4NCgkJCTwvaDQ+DQoJCQk8cD48Pz0gVGV4dDo6XygiWW91IGFyZSBjdXJyZW50bHkgdmlld2luZyB0aGUgdHJhc2hlZCBpdGVtcy4iKSA/PjwvcD4NCgkJCTxidXR0b24gb25jbGljaz0iZW1wdHlUcmFzaCgpOyIgY2xhc3M9ImJ0biBidG4tc21hbGwgYnRuLWRhbmdlciI+DQoJCQkJPHNwYW4gY2xhc3M9Imljb24tZGVsZXRlIiBhcmlhLWhpZGRlbj0idHJ1ZSI+PC9zcGFuPg0KCQkJCTw/PSBUZXh0OjpfKCJFbXB0eSB0cmFzaCIpID8+DQoJCQk8L2J1dHRvbj4NCgkJPD9waHAgZW5kaWY7ID8+DQoJCTxidXR0b24gb25jbGljaz0iZXhpdFRyYXNoKCk7IiBjbGFzcz0iYnRuIGJ0bi1zbWFsbCI+DQoJCQk8c3BhbiBjbGFzcz0iaWNvbi1iYWNrIiBhcmlhLWhpZGRlbj0idHJ1ZSI+PC9zcGFuPg0KCQkJPD89IFRleHQ6Ol8oIkV4aXQgdHJhc2giKSA/Pg0KCQk8L2J1dHRvbj4NCgk8L2Rpdj4NCjw/cGhwIGVuZGlmOyA/Pg==', 'Trash Helper', '', '', '', 1, 8, '', 27, ''), +(97, '', 'trashhelper', 'Trash Helper Layout', '', 'PD9waHAgaWYgKCRkaXNwbGF5RGF0YS0+c3RhdGUtPmdldCgnZmlsdGVyLnB1Ymxpc2hlZCcpID09IC0yICYmICgkZGlzcGxheURhdGEtPmNhblN0YXRlICYmICRkaXNwbGF5RGF0YS0+Y2FuRGVsZXRlKSkgOiA/Pg0KCTxzY3JpcHQ+DQoJCS8vIGNoYW5nZSB0aGUgY2xhc3Mgb2YgdGhlIGRlbGV0ZSBidXR0b24NCgkJalF1ZXJ5KCIjdG9vbGJhci1kZWxldGUgYnV0dG9uIikudG9nZ2xlQ2xhc3MoImJ0bi1kYW5nZXIiKTsNCgkJLy8gZnVuY3Rpb24gdG8gZW1wdHkgdGhlIHRyYXNoDQoJCWZ1bmN0aW9uIGVtcHR5VHJhc2goKSB7DQoJCQlpZiAoZG9jdW1lbnQuYWRtaW5Gb3JtLmJveGNoZWNrZWQudmFsdWUgPT0gMCkgew0KCQkJCS8vIHNlbGVjdCBhbGwgdGhlIGl0ZW1zIHZpc2FibGUNCgkJCQlkb2N1bWVudC5hZG1pbkZvcm0uZWxlbWVudHNbJ2NoZWNrYWxsLXRvZ2dsZSddLmNoZWNrZWQ9MTsNCgkJCQlKb29tbGEuY2hlY2tBbGwoZG9jdW1lbnQuYWRtaW5Gb3JtLmVsZW1lbnRzWydjaGVja2FsbC10b2dnbGUnXSk7DQoJCQkJLy8gY2hlY2sgdG8gY29uZmlybSB0aGUgZGVsZXRpb24NCgkJCQlpZihjb25maXJtKCc8P3BocCBlY2hvIFRleHQ6Ol8oIkFyZSB5b3Ugc3VyZSB5b3Ugd2FudCB0byBkZWxldGU/IENvbmZpcm1pbmcgd2lsbCBwZXJtYW5lbnRseSBkZWxldGUgdGhlIHNlbGVjdGVkIGl0ZW0ocykhIikgPz4nKSkgew0KCQkJCQlKb29tbGEuc3VibWl0YnV0dG9uKCc8P3BocCBlY2hvICRkaXNwbGF5RGF0YS0+Z2V0TmFtZSgpOyA/Pi5kZWxldGUnKTsNCgkJCQl9IGVsc2Ugew0KCQkJCQlkb2N1bWVudC5hZG1pbkZvcm0uZWxlbWVudHNbJ2NoZWNrYWxsLXRvZ2dsZSddLmNoZWNrZWQ9MDsNCgkJCQkJSm9vbWxhLmNoZWNrQWxsKGRvY3VtZW50LmFkbWluRm9ybS5lbGVtZW50c1snY2hlY2thbGwtdG9nZ2xlJ10pOw0KCQkJCX0NCgkJCX0gZWxzZSB7DQoJCQkJLy8gY29uZmlybSBkZWxldGlvbiBvZiB0aG9zZSBzZWxlY3RlZA0KCQkJCWlmIChjb25maXJtKCc8P3BocCBlY2hvIFRleHQ6Ol8oIkFyZSB5b3Ugc3VyZSB5b3Ugd2FudCB0byBkZWxldGU/IENvbmZpcm1pbmcgd2lsbCBwZXJtYW5lbnRseSBkZWxldGUgdGhlIHNlbGVjdGVkIGl0ZW0ocykhIikgPz4nKSkgew0KCQkJCQlKb29tbGEuc3VibWl0YnV0dG9uKCc8P3BocCBlY2hvICRkaXNwbGF5RGF0YS0+Z2V0TmFtZSgpOyA/Pi5kZWxldGUnKTsNCgkJCQl9Ow0KCQkJfQ0KCQkJcmV0dXJuIGZhbHNlOw0KCQl9DQoJCS8vIGZ1bmN0aW9uIHRvIGV4aXQgdGhlIHRhc2ggc3RhdGUNCgkJZnVuY3Rpb24gZXhpdFRyYXNoKCkgew0KCQkJZG9jdW1lbnQuYWRtaW5Gb3JtLmZpbHRlcl9wdWJsaXNoZWQuc2VsZWN0ZWRJbmRleCA9IDA7DQoJCQlkb2N1bWVudC5hZG1pbkZvcm0uc3VibWl0KCk7DQoJCQlyZXR1cm4gZmFsc2U7DQoJCX0NCgk8L3NjcmlwdD4NCgk8ZGl2IGNsYXNzPSJhbGVydCBhbGVydC1lcnJvciI+DQoJCTw/cGhwIGlmIChlbXB0eSgkZGlzcGxheURhdGEtPml0ZW1zKSk6ID8+DQoJCQk8aDQgY2xhc3M9ImFsZXJ0LWhlYWRpbmciPg0KCQkJCTxzcGFuIGNsYXNzPSJpY29uLXRyYXNoIj48L3NwYW4+DQoJCQkJPD9waHAgZWNobyBUZXh0OjpfKCJUcmFzaCBBcmVhIikgPz4NCgkJCTwvaDQ+DQoJCQk8cD48P3BocCBlY2hvIFRleHQ6Ol8oIllvdSBhcmUgY3VycmVudGx5IHZpZXdpbmcgdGhlIHRyYXNoIGFyZWEsIGFuZCB5b3UgZG9uJ3QgaGF2ZSBhbnkgaXRlbXMgaW4gdHJhc2ggYXQgdGhlIG1vbWVudCEiKSA/PjwvcD4NCgkJPD9waHAgZWxzZTogPz4NCgkJCTxoNCBjbGFzcz0iYWxlcnQtaGVhZGluZyI+DQoJCQkJPHNwYW4gY2xhc3M9Imljb24tdHJhc2giPjwvc3Bhbj4NCgkJCQk8P3BocCBlY2hvIFRleHQ6Ol8oIlRyYXNoZWQgaXRlbXMiKSA/Pg0KCQkJPC9oND4NCgkJCTxwPjw/cGhwIGVjaG8gVGV4dDo6XygiWW91IGFyZSBjdXJyZW50bHkgdmlld2luZyB0aGUgdHJhc2hlZCBpdGVtcy4iKSA/PjwvcD4NCgkJCTxidXR0b24gb25jbGljaz0iZW1wdHlUcmFzaCgpOyIgY2xhc3M9ImJ0biBidG4tc21hbGwgYnRuLWRhbmdlciI+DQoJCQkJPHNwYW4gY2xhc3M9Imljb24tZGVsZXRlIiBhcmlhLWhpZGRlbj0idHJ1ZSI+PC9zcGFuPg0KCQkJCTw/cGhwIGVjaG8gVGV4dDo6XygiRW1wdHkgdHJhc2giKSA/Pg0KCQkJPC9idXR0b24+DQoJCTw/cGhwIGVuZGlmOyA/Pg0KCQk8YnV0dG9uIG9uY2xpY2s9ImV4aXRUcmFzaCgpOyIgY2xhc3M9ImJ0biBidG4tc21hbGwiPg0KCQkJPHNwYW4gY2xhc3M9Imljb24tYmFjayIgYXJpYS1oaWRkZW49InRydWUiPjwvc3Bhbj4NCgkJCTw/cGhwIGVjaG8gVGV4dDo6XygiRXhpdCB0cmFzaCIpID8+DQoJCTwvYnV0dG9uPg0KCTwvZGl2Pg0KPD9waHAgZW5kaWY7ID8+', 'Trash Helper', '', '', '', 1, 9, '', 27, ''), (101, 1, 'input', 'Input', '', 'PGlucHV0DQoJY2xhc3M9Ijw/cGhwIGVjaG8gJGNsYXNzIC4gJGNsYXNzX290aGVyOyA/PiINCgluYW1lPSI8P3BocCBlY2hvICRuYW1lOyA/PiINCglpZD0iPD9waHAgZWNobyAkaWQ7ID8+Ig0KCXR5cGU9Ijw/cGhwIGVjaG8gJHR5cGU7ID8+Ig0KCXBsYWNlaG9sZGVyPSI8P3BocCBlY2hvICRwbGFjZWhvbGRlcjsgPz4iDQoJdmFsdWU9Ijw/cGhwIGVjaG8gJHZhbHVlOyA/PiINCgk8P3BocCBlY2hvICRyZWFkb25seTsgZWNobyAkb25jaGFuZ2U7IGVjaG8gJG9ua2V5ZG93bjsgZWNobyAkZm9ybWF0OyBlY2hvICRyZXF1aXJlZDsgPz4NCj4=', 'Input', 'Ly8gRXh0cmFjdCBhbGwga2V5cyBmcm9tICRkaXNwbGF5RGF0YSBhcyBpbmRpdmlkdWFsIHZhcmlhYmxlcy4NCmV4dHJhY3QoJGRpc3BsYXlEYXRhKTsNCg0KLy8gQXNzaWduIGRlZmF1bHQgdmFsdWVzIGZvciB2YXJpYWJsZXMgdGhhdCBtaWdodCBub3QgYmUgcHJlc2VudCBpbiAkZGlzcGxheURhdGEuDQoNCi8vIFRoZSAnaWQnIHBhcmFtZXRlciwgZGVmYXVsdGluZyB0byBhbiBlbXB0eSBzdHJpbmcgaWYgbm90IHNldCBvciBpcyBudWxsLg0KJGlkID8/PSAnJzsNCg0KLy8gVGhlICduYW1lJyBwYXJhbWV0ZXIsIGRlZmF1bHRpbmcgdG8gJ2lkJyBpZiBub3Qgc2V0LiBBZGRpdGlvbmFsbHksIHJlcGxhY2UgaHlwaGVucyB3aXRoIHVuZGVyc2NvcmVzLg0KJG5hbWUgPz89ICRpZDsNCiRuYW1lID0gc3RyX3JlcGxhY2UoJy0nLCAnXycsICRuYW1lKTsNCg0KLy8gVGhlICd2YWx1ZScgcGFyYW1ldGVyLCBkZWZhdWx0aW5nIHRvIGFuIGVtcHR5IHN0cmluZyBpZiBub3Qgc2V0IG9yIGlzIG51bGwuDQokdmFsdWUgPz89ICcnOw0KDQovLyBUaGUgJ2NsYXNzJyBwYXJhbWV0ZXIsIGRlZmF1bHRpbmcgdG8gJ3VrLWlucHV0JyBpZiBub3Qgc2V0IG9yIGlzIG51bGwuDQokY2xhc3MgPz89ICd1ay1pbnB1dCc7DQoNCi8vIFRoZSAnY2xhc3Nfb3RoZXInIHBhcmFtZXRlciwgcHJlcGVuZGVkIHdpdGggYSBzcGFjZSBpZiBzZXQsIG90aGVyd2lzZSBkZWZhdWx0aW5nIHRvIGFuIGVtcHR5IHN0cmluZy4NCiRjbGFzc19vdGhlciA9IGlzc2V0KCRjbGFzc19vdGhlcikgPyAnICcgLiAkY2xhc3Nfb3RoZXIgOiAnJzsNCg0KLy8gVGhlICdwbGFjZWhvbGRlcicgcGFyYW1ldGVyLCBkZWZhdWx0aW5nIHRvIGFuIGVtcHR5IHN0cmluZyBpZiBub3Qgc2V0IG9yIGlzIG51bGwuDQokcGxhY2Vob2xkZXIgPz89ICcnOw0KDQovLyBUaGUgJ3R5cGUnIHBhcmFtZXRlciwgZGVmYXVsdGluZyB0byAndGV4dCcgaWYgbm90IHNldCBvciBpcyBudWxsLg0KJHR5cGUgPz89ICd0ZXh0JzsNCg0KLy8gVGhlICdyZWFkb25seScgYXR0cmlidXRlLCBzZXQgdG8gJ3JlYWRvbmx5JyBpZiB0cnVlLCBvdGhlcndpc2UgbGVmdCBhcyBhbiBlbXB0eSBzdHJpbmcuDQokcmVhZG9ubHkgPSAhZW1wdHkoJHJlYWRvbmx5KSA/ICcgcmVhZG9ubHknIDogJyc7DQoNCi8vIFRoZSAnZm9ybWF0JyBhdHRyaWJ1dGUsIGFkZGVkIG9ubHkgaWYgc2V0LCBvdGhlcndpc2UgbGVmdCBhcyBhbiBlbXB0eSBzdHJpbmcuDQokZm9ybWF0ID0gIWVtcHR5KCRmb3JtYXQpID8gJyBmb3JtYXQ9IicgLiAkZm9ybWF0IC4gJyInIDogJyc7DQoNCi8vIFRoZSAnb25jaGFuZ2UnIGF0dHJpYnV0ZSwgYWRkZWQgb25seSBpZiBzZXQsIG90aGVyd2lzZSBsZWZ0IGFzIGFuIGVtcHR5IHN0cmluZy4NCiRvbmNoYW5nZSA9IGlzc2V0KCRvbmNoYW5nZSkgPyAnIG9uY2hhbmdlPSInIC4gJG9uY2hhbmdlIC4gJyInIDogJyc7DQoNCi8vIFRoZSAnb25rZXlkb3duJyBhdHRyaWJ1dGUsIGFkZGVkIG9ubHkgaWYgc2V0LCBvdGhlcndpc2UgbGVmdCBhcyBhbiBlbXB0eSBzdHJpbmcuDQokb25rZXlkb3duID0gaXNzZXQoJG9ua2V5ZG93bikgPyAnIG9ua2V5ZG93bj0iJyAuICRvbmtleWRvd24gLiAnIicgOiAnJzsNCg0KLy8gVGhlICdyZXF1aXJlZCcgYXR0cmlidXRlLCBzZXQgdG8gJ3JlcXVpcmVkJyBpZiB0cnVlLCBvdGhlcndpc2UgbGVmdCBhcyBhbiBlbXB0eSBzdHJpbmcuDQokcmVxdWlyZWQgPSAhZW1wdHkoJHJlcXVpcmVkKSA/ICcgcmVxdWlyZWQnIDogJyc7', '', '', 1, 5, '', 30, ''), (102, 1, 'inputbox', 'Input Box', '', 'PGRpdiBjbGFzcz0iPD9waHAgZWNobyAkbWFyZ2luOyA/PiI+DQoJPGxhYmVsIGNsYXNzPSI8P3BocCBlY2hvICRjbGFzc19sYWJlbCA7IGVjaG8gJGNsYXNzX290aGVyX2xhYmVsOyA/PiIgZm9yPSI8P3BocCBlY2hvICRuYW1lOyA/PiI+PD9waHAgZWNobyAkbGFiZWw7ID8+PC9sYWJlbD4NCgk8ZGl2IGNsYXNzPSJ1ay1mb3JtLWNvbnRyb2xzIj4NCgkJPD9waHAgZWNobyBMYXlvdXRIZWxwZXI6OnJlbmRlcignaW5wdXQnLCAkZGlzcGxheURhdGEpOyA/Pg0KCTwvZGl2Pg0KPC9kaXY+', 'Input Box', 'Ly8gRXh0cmFjdCBhbGwga2V5cyBmcm9tICRkaXNwbGF5RGF0YSBhcyBpbmRpdmlkdWFsIHZhcmlhYmxlcy4NCmV4dHJhY3QoJGRpc3BsYXlEYXRhKTsNCg0KLy8gQXNzaWduIGRlZmF1bHQgdmFsdWVzIGZvciB2YXJpYWJsZXMgdGhhdCBtaWdodCBub3QgYmUgcHJlc2VudCBpbiAkZGlzcGxheURhdGEuDQoNCi8vIFRoZSAnaWQnIHBhcmFtZXRlciwgZGVmYXVsdGluZyB0byBhbiBlbXB0eSBzdHJpbmcgaWYgbm90IHNldCBvciBpcyBudWxsLg0KJGlkID8/PSAnJzsNCg0KLy8gVGhlICduYW1lJyBwYXJhbWV0ZXIsIGRlZmF1bHRpbmcgdG8gJ2lkJyBpZiBub3Qgc2V0IG9yIGlzIG51bGwuIEFkZGl0aW9uYWxseSwgcmVwbGFjZSBoeXBoZW5zIHdpdGggdW5kZXJzY29yZXMuDQokbmFtZSA/Pz0gJGlkOw0KJG5hbWUgPSBzdHJfcmVwbGFjZSgnLScsICdfJywgJG5hbWUpOw0KDQovLyBUaGUgJ2xhYmVsJyBwYXJhbWV0ZXIsIGRlZmF1bHRpbmcgdG8gdGhlICdMYWJlbCcgdHJhbnNsYXRpb24gaWYgbm90IHNldCBvciBpcyBudWxsLg0KJGxhYmVsID8/PSBUZXh0OjpfKCdMYWJlbCcpOw0KDQovLyBUaGUgJ2NsYXNzX2xhYmVsJyBwYXJhbWV0ZXIsIGRlZmF1bHRpbmcgdG8gJ3VrLWZvcm0tbGFiZWwnIGlmIG5vdCBzZXQgb3IgaXMgbnVsbC4NCiRjbGFzc19sYWJlbCA/Pz0gJ3VrLWZvcm0tbGFiZWwnOw0KDQovLyBUaGUgJ2NsYXNzX290aGVyX2xhYmVsJyBwYXJhbWV0ZXIsIHByZXBlbmRlZCB3aXRoIGEgc3BhY2UgaWYgc2V0LCBvdGhlcndpc2UgZGVmYXVsdGluZyB0byBhbiBlbXB0eSBzdHJpbmcuDQokY2xhc3Nfb3RoZXJfbGFiZWwgPSBpc3NldCgkY2xhc3Nfb3RoZXJfbGFiZWwpID8gJyAnIC4gJGNsYXNzX290aGVyX2xhYmVsIDogJyc7DQoNCi8vIFRoZSAnbWFyZ2luJyBwYXJhbWV0ZXIsIGRlZmF1bHRpbmcgdG8gJ3VrLW1hcmdpbi1zbWFsbCcgaWYgbm90IHNldCBvciBpcyBudWxsLg0KJG1hcmdpbiA/Pz0gJ3VrLW1hcmdpbi1zbWFsbCc7', '', '', 1, 5, '', 31, ''), (103, 1, 'select', 'Select', '', 'PHNlbGVjdCBjbGFzcz0iPD9waHAgZWNobyAkY2xhc3MgLiAkY2xhc3Nfb3RoZXI7ID8+IiBpZD0iPD9waHAgZWNobyAkaWQ7ID8+IiBuYW1lPSI8P3BocCBlY2hvICRuYW1lOyA/PiI8P3BocCBlY2hvICRvbmtleWRvd247IGVjaG8gJG9uY2hhbmdlOyA/Pj4NCjw/cGhwIGlmICgkb3B0aW9ucyk6ID8+DQoJPD9waHAgZm9yZWFjaCAoJG9wdGlvbnMgYXMgJGtleSA9PiAkdmFsdWUpOiA/Pg0KCQk8P3BocCBpZiAoaXNfb2JqZWN0KCR2YWx1ZSkgJiYgaXNzZXQoJHZhbHVlLT5rZXkpICYmIGlzc2V0KCR2YWx1ZS0+dmFsdWUpKTogPz4NCgkJCTw/cGhwIGlmICgkZGVmYXVsdCA9PT0gJHZhbHVlLT5rZXkpOiA/Pg0KCQkJCTxvcHRpb24gdmFsdWU9Ijw/cGhwIGVjaG8gICR2YWx1ZS0+a2V5OyA/PiIgc2VsZWN0ZWQ+PD9waHAgZWNobyAkdmFsdWUtPnZhbHVlOyA/Pjwvb3B0aW9uPg0KCQkJPD9waHAgZWxzZTogPz4NCgkJCQk8b3B0aW9uIHZhbHVlPSI8P3BocCBlY2hvICAkdmFsdWUtPmtleTsgPz4iPjw/cGhwIGVjaG8gJHZhbHVlLT52YWx1ZTsgPz48L29wdGlvbj4NCgkJCTw/cGhwIGVuZGlmOyA/Pg0KCQk8P3BocCBlbHNlOiA/Pg0KCQkJPD9waHAgaWYgKCRkZWZhdWx0ID09PSAka2V5KTogPz4NCgkJCQk8b3B0aW9uIHZhbHVlPSI8P3BocCBlY2hvICRrZXk7ID8+IiBzZWxlY3RlZD48P3BocCBlY2hvICR2YWx1ZTsgPz48L29wdGlvbj4NCgkJCTw/cGhwIGVsc2U6ID8+DQoJCQkJPG9wdGlvbiB2YWx1ZT0iPD9waHAgZWNobyAka2V5OyA/PiI+PD9waHAgZWNobyAkdmFsdWU7ID8+PC9vcHRpb24+DQoJCQk8P3BocCBlbmRpZjsgPz4NCgkJPD9waHAgZW5kaWY7ID8+DQoJPD9waHAgZW5kZm9yZWFjaDsgPz4NCjw/cGhwIGVsc2U6ID8+DQoJPG9wdGlvbj48P3BocCBlY2hvIFRleHQ6Ol8oJ0VtcHR5Jyk7ID8+PC9vcHRpb24+DQo8P3BocCBlbmRpZjsgPz4NCjwvc2VsZWN0Pg==', 'Select', 'Ly8gRXh0cmFjdCBhbGwga2V5cyBmcm9tICRkaXNwbGF5RGF0YSBhcyBpbmRpdmlkdWFsIHZhcmlhYmxlcy4NCmV4dHJhY3QoJGRpc3BsYXlEYXRhKTsNCg0KLy8gQXNzaWduIGRlZmF1bHQgdmFsdWVzIGZvciB2YXJpYWJsZXMgdGhhdCBtaWdodCBub3QgYmUgcHJlc2VudCBpbiAkZGlzcGxheURhdGEuDQoNCi8vIFRoZSAnaWQnIHBhcmFtZXRlciwgZGVmYXVsdGluZyB0byBhbiBlbXB0eSBzdHJpbmcgaWYgbm90IHNldCBvciBpcyBudWxsLg0KJGlkID8/PSAnJzsNCg0KLy8gVGhlICduYW1lJyBwYXJhbWV0ZXIsIGRlZmF1bHRpbmcgdG8gJ2lkJyBpZiBub3Qgc2V0LiBBZGRpdGlvbmFsbHksIHJlcGxhY2UgaHlwaGVucyB3aXRoIHVuZGVyc2NvcmVzLg0KJG5hbWUgPz89ICRpZDsNCiRuYW1lID0gc3RyX3JlcGxhY2UoJy0nLCAnXycsICRuYW1lKTsNCg0KLy8gVGhlICdjbGFzcycgcGFyYW1ldGVyLCBkZWZhdWx0aW5nIHRvICd1ay1zZWxlY3QnIGlmIG5vdCBzZXQgb3IgaXMgbnVsbC4NCiRjbGFzcyA/Pz0gJ3VrLXNlbGVjdCc7DQoNCi8vIFRoZSAnY2xhc3Nfb3RoZXInIHBhcmFtZXRlciwgcHJlcGVuZGVkIHdpdGggYSBzcGFjZSBpZiBzZXQsIG90aGVyd2lzZSBkZWZhdWx0aW5nIHRvIGFuIGVtcHR5IHN0cmluZy4NCiRjbGFzc19vdGhlciA9IGlzc2V0KCRjbGFzc19vdGhlcikgPyAnICcgLiAkY2xhc3Nfb3RoZXIgOiAnJzsNCg0KLy8gVGhlICdvcHRpb25zJyBwYXJhbWV0ZXIsIHNldCBvbmx5IGlmIGl0IGV4aXN0cyBhbmQgaXMgYW4gYXJyYXksIG90aGVyd2lzZSBkZWZhdWx0cyB0byBgZmFsc2VgLg0KJG9wdGlvbnMgPSAoaXNzZXQoJG9wdGlvbnMpICYmIGlzX2FycmF5KCRvcHRpb25zKSkgPyAkb3B0aW9ucyA6IGZhbHNlOw0KDQovLyBUaGUgJ2RlZmF1bHQnIHBhcmFtZXRlciwgZGVmYXVsdGluZyB0byBhbiBlbXB0eSBzdHJpbmcgaWYgbm90IHNldCBvciBpcyBudWxsLg0KJGRlZmF1bHQgPz89ICcnOw0KDQovLyBUaGUgJ29uY2hhbmdlJyBhdHRyaWJ1dGUsIGFkZGVkIG9ubHkgaWYgc2V0LCBvdGhlcndpc2UgbGVmdCBhcyBhbiBlbXB0eSBzdHJpbmcuDQokb25jaGFuZ2UgPSBpc3NldCgkb25jaGFuZ2UpID8gJyBvbmNoYW5nZT0iJyAuICRvbmNoYW5nZSAuICciJyA6ICcnOw0KDQovLyBUaGUgJ29ua2V5ZG93bicgYXR0cmlidXRlLCBhZGRlZCBvbmx5IGlmIHNldCwgb3RoZXJ3aXNlIGxlZnQgYXMgYW4gZW1wdHkgc3RyaW5nLg0KJG9ua2V5ZG93biA9IGlzc2V0KCRvbmtleWRvd24pID8gJyBvbmtleWRvd249IicgLiAkb25rZXlkb3duIC4gJyInIDogJyc7', '', '', 1, 7, '', 32, ''), diff --git a/admin/sql/updates/mysql/3.2.4.sql b/admin/sql/updates/mysql/3.2.4.sql new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/admin/sql/updates/mysql/3.2.4.sql @@ -0,0 +1 @@ + diff --git a/admin/views/admin_custom_tabs/view.html.php b/admin/views/admin_custom_tabs/view.html.php index 428616d32..a154c9097 100644 --- a/admin/views/admin_custom_tabs/view.html.php +++ b/admin/views/admin_custom_tabs/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewAdmin_custom_tabs extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/admin_fields/view.html.php b/admin/views/admin_fields/view.html.php index ace172210..1d4df2c4c 100644 --- a/admin/views/admin_fields/view.html.php +++ b/admin/views/admin_fields/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewAdmin_fields extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/admin_fields_conditions/view.html.php b/admin/views/admin_fields_conditions/view.html.php index 440533e9e..aa8c8baae 100644 --- a/admin/views/admin_fields_conditions/view.html.php +++ b/admin/views/admin_fields_conditions/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewAdmin_fields_conditions extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/admin_fields_relations/view.html.php b/admin/views/admin_fields_relations/view.html.php index ee2fedc29..9bd8dbf0f 100644 --- a/admin/views/admin_fields_relations/view.html.php +++ b/admin/views/admin_fields_relations/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewAdmin_fields_relations extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index b55c63e8c..4a40a61d4 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewAdmin_view extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index 12a202488..6494dc138 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewAdmin_views extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/admins_custom_tabs/view.html.php b/admin/views/admins_custom_tabs/view.html.php index 06d0876cc..81fad938b 100644 --- a/admin/views/admins_custom_tabs/view.html.php +++ b/admin/views/admins_custom_tabs/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewAdmins_custom_tabs extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/admins_fields/view.html.php b/admin/views/admins_fields/view.html.php index 29a4c335a..a82ddace4 100644 --- a/admin/views/admins_fields/view.html.php +++ b/admin/views/admins_fields/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewAdmins_fields extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/admins_fields_conditions/view.html.php b/admin/views/admins_fields_conditions/view.html.php index 04b666912..0a52672e2 100644 --- a/admin/views/admins_fields_conditions/view.html.php +++ b/admin/views/admins_fields_conditions/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewAdmins_fields_conditions extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/admins_fields_relations/view.html.php b/admin/views/admins_fields_relations/view.html.php index 06cc45a12..6ec1827f8 100644 --- a/admin/views/admins_fields_relations/view.html.php +++ b/admin/views/admins_fields_relations/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewAdmins_fields_relations extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/class_extendings/view.html.php b/admin/views/class_extendings/view.html.php index 302f48e63..2484854d8 100644 --- a/admin/views/class_extendings/view.html.php +++ b/admin/views/class_extendings/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewClass_extendings extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/class_extends/view.html.php b/admin/views/class_extends/view.html.php index a489ba826..88f5c637b 100644 --- a/admin/views/class_extends/view.html.php +++ b/admin/views/class_extends/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewClass_extends extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/class_method/view.html.php b/admin/views/class_method/view.html.php index 919e3e572..3717c2714 100644 --- a/admin/views/class_method/view.html.php +++ b/admin/views/class_method/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewClass_method extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/class_methods/view.html.php b/admin/views/class_methods/view.html.php index 8dbb68f70..19661341b 100644 --- a/admin/views/class_methods/view.html.php +++ b/admin/views/class_methods/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewClass_methods extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/class_properties/view.html.php b/admin/views/class_properties/view.html.php index feeb4d2ff..f7ad3cbee 100644 --- a/admin/views/class_properties/view.html.php +++ b/admin/views/class_properties/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewClass_properties extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/class_property/view.html.php b/admin/views/class_property/view.html.php index 3008dfa85..5eaac3d72 100644 --- a/admin/views/class_property/view.html.php +++ b/admin/views/class_property/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewClass_property extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php index d19ce284f..b5470e329 100644 --- a/admin/views/compiler/view.html.php +++ b/admin/views/compiler/view.html.php @@ -115,6 +115,7 @@ class ComponentbuilderViewCompiler extends HtmlView throw new \Exception(implode(PHP_EOL, $errors), 500); } + // Display the template parent::display($tpl); } diff --git a/admin/views/component_admin_views/view.html.php b/admin/views/component_admin_views/view.html.php index 5e5309e8c..9eb78072c 100644 --- a/admin/views/component_admin_views/view.html.php +++ b/admin/views/component_admin_views/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewComponent_admin_views extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/component_config/view.html.php b/admin/views/component_config/view.html.php index 549e11a60..76a7bc984 100644 --- a/admin/views/component_config/view.html.php +++ b/admin/views/component_config/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewComponent_config extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/component_custom_admin_menus/view.html.php b/admin/views/component_custom_admin_menus/view.html.php index cd9550e48..8f90c499d 100644 --- a/admin/views/component_custom_admin_menus/view.html.php +++ b/admin/views/component_custom_admin_menus/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewComponent_custom_admin_menus extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/component_custom_admin_views/view.html.php b/admin/views/component_custom_admin_views/view.html.php index 1cf1648f6..1415e7ab4 100644 --- a/admin/views/component_custom_admin_views/view.html.php +++ b/admin/views/component_custom_admin_views/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewComponent_custom_admin_views extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/component_dashboard/view.html.php b/admin/views/component_dashboard/view.html.php index 9a67c942d..ed46cc9d5 100644 --- a/admin/views/component_dashboard/view.html.php +++ b/admin/views/component_dashboard/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewComponent_dashboard extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/component_files_folders/view.html.php b/admin/views/component_files_folders/view.html.php index 22a5efddf..2583b1d8f 100644 --- a/admin/views/component_files_folders/view.html.php +++ b/admin/views/component_files_folders/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewComponent_files_folders extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/component_modules/view.html.php b/admin/views/component_modules/view.html.php index abb6efdcc..bbbc45dc5 100644 --- a/admin/views/component_modules/view.html.php +++ b/admin/views/component_modules/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewComponent_modules extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/component_mysql_tweaks/view.html.php b/admin/views/component_mysql_tweaks/view.html.php index 30ef68bd1..c35d1a4e4 100644 --- a/admin/views/component_mysql_tweaks/view.html.php +++ b/admin/views/component_mysql_tweaks/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewComponent_mysql_tweaks extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/component_placeholders/view.html.php b/admin/views/component_placeholders/view.html.php index 3ba51e829..e22b78199 100644 --- a/admin/views/component_placeholders/view.html.php +++ b/admin/views/component_placeholders/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewComponent_placeholders extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/component_plugins/view.html.php b/admin/views/component_plugins/view.html.php index 5ccd24e45..653cb3241 100644 --- a/admin/views/component_plugins/view.html.php +++ b/admin/views/component_plugins/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewComponent_plugins extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/component_router/view.html.php b/admin/views/component_router/view.html.php index 695885e36..a76662356 100644 --- a/admin/views/component_router/view.html.php +++ b/admin/views/component_router/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewComponent_router extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/component_site_views/view.html.php b/admin/views/component_site_views/view.html.php index 27d6c1bbc..765dbe150 100644 --- a/admin/views/component_site_views/view.html.php +++ b/admin/views/component_site_views/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewComponent_site_views extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/component_updates/view.html.php b/admin/views/component_updates/view.html.php index 138b051eb..4e5eb6b9a 100644 --- a/admin/views/component_updates/view.html.php +++ b/admin/views/component_updates/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewComponent_updates extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/components_admin_views/view.html.php b/admin/views/components_admin_views/view.html.php index 264819a0e..b939f1bc3 100644 --- a/admin/views/components_admin_views/view.html.php +++ b/admin/views/components_admin_views/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewComponents_admin_views extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/components_config/view.html.php b/admin/views/components_config/view.html.php index 0aeb8d8fb..dd7ffbfe0 100644 --- a/admin/views/components_config/view.html.php +++ b/admin/views/components_config/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewComponents_config extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/components_custom_admin_menus/view.html.php b/admin/views/components_custom_admin_menus/view.html.php index 14da96575..2132d7725 100644 --- a/admin/views/components_custom_admin_menus/view.html.php +++ b/admin/views/components_custom_admin_menus/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewComponents_custom_admin_menus extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/components_custom_admin_views/view.html.php b/admin/views/components_custom_admin_views/view.html.php index 607dc4aa8..bdc014aa5 100644 --- a/admin/views/components_custom_admin_views/view.html.php +++ b/admin/views/components_custom_admin_views/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewComponents_custom_admin_views extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/components_dashboard/view.html.php b/admin/views/components_dashboard/view.html.php index 96d7c5fea..205833e44 100644 --- a/admin/views/components_dashboard/view.html.php +++ b/admin/views/components_dashboard/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewComponents_dashboard extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/components_files_folders/view.html.php b/admin/views/components_files_folders/view.html.php index 0318eba8c..5278fa84c 100644 --- a/admin/views/components_files_folders/view.html.php +++ b/admin/views/components_files_folders/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewComponents_files_folders extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/components_modules/view.html.php b/admin/views/components_modules/view.html.php index 69f96655b..c99139c22 100644 --- a/admin/views/components_modules/view.html.php +++ b/admin/views/components_modules/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewComponents_modules extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/components_mysql_tweaks/view.html.php b/admin/views/components_mysql_tweaks/view.html.php index 7e72f45d5..841924736 100644 --- a/admin/views/components_mysql_tweaks/view.html.php +++ b/admin/views/components_mysql_tweaks/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewComponents_mysql_tweaks extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/components_placeholders/view.html.php b/admin/views/components_placeholders/view.html.php index a8de5de0a..59a713b28 100644 --- a/admin/views/components_placeholders/view.html.php +++ b/admin/views/components_placeholders/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewComponents_placeholders extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/components_plugins/view.html.php b/admin/views/components_plugins/view.html.php index 5fe4e8e8c..844325e0c 100644 --- a/admin/views/components_plugins/view.html.php +++ b/admin/views/components_plugins/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewComponents_plugins extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/components_routers/view.html.php b/admin/views/components_routers/view.html.php index 2f8cf88f6..61e1ccd6f 100644 --- a/admin/views/components_routers/view.html.php +++ b/admin/views/components_routers/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewComponents_routers extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/components_site_views/view.html.php b/admin/views/components_site_views/view.html.php index 5f2e3b2b9..a85ece515 100644 --- a/admin/views/components_site_views/view.html.php +++ b/admin/views/components_site_views/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewComponents_site_views extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/components_updates/view.html.php b/admin/views/components_updates/view.html.php index 85a9a6ff4..899084fcf 100644 --- a/admin/views/components_updates/view.html.php +++ b/admin/views/components_updates/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewComponents_updates extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php index a3da61381..5be6aa06a 100644 --- a/admin/views/custom_admin_view/view.html.php +++ b/admin/views/custom_admin_view/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewCustom_admin_view extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php index a5c000416..314a5dfb1 100644 --- a/admin/views/custom_admin_views/view.html.php +++ b/admin/views/custom_admin_views/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewCustom_admin_views extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/custom_code/view.html.php b/admin/views/custom_code/view.html.php index 4c045c4df..6bed28de9 100644 --- a/admin/views/custom_code/view.html.php +++ b/admin/views/custom_code/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewCustom_code extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php index edf40602c..e017d565c 100644 --- a/admin/views/custom_codes/view.html.php +++ b/admin/views/custom_codes/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewCustom_codes extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/dynamic_get/view.html.php b/admin/views/dynamic_get/view.html.php index 8c9759ec7..0b56e0b28 100644 --- a/admin/views/dynamic_get/view.html.php +++ b/admin/views/dynamic_get/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewDynamic_get extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php index 50ce28698..aca5c1fbc 100644 --- a/admin/views/dynamic_gets/view.html.php +++ b/admin/views/dynamic_gets/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewDynamic_gets extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/field/view.html.php b/admin/views/field/view.html.php index f1e9fc84d..7db2c844a 100644 --- a/admin/views/field/view.html.php +++ b/admin/views/field/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewField extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php index b1a56ba1e..f78dfde46 100644 --- a/admin/views/fields/view.html.php +++ b/admin/views/fields/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewFields extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php index f509bcea2..a5031d708 100644 --- a/admin/views/fieldtype/view.html.php +++ b/admin/views/fieldtype/view.html.php @@ -82,11 +82,11 @@ class ComponentbuilderViewFieldtype extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/fieldtypes/view.html.php b/admin/views/fieldtypes/view.html.php index 1fb562b1c..a11b55610 100644 --- a/admin/views/fieldtypes/view.html.php +++ b/admin/views/fieldtypes/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewFieldtypes extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/get_snippets/view.html.php b/admin/views/get_snippets/view.html.php index c3b5bbfbd..25979a110 100644 --- a/admin/views/get_snippets/view.html.php +++ b/admin/views/get_snippets/view.html.php @@ -60,6 +60,7 @@ class ComponentbuilderViewGet_snippets extends HtmlView throw new \Exception(implode(PHP_EOL, $errors), 500); } + // Display the template parent::display($tpl); } diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index 4615ce1e4..7663f41bb 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewHelp_document extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index 688e7da03..0188f601e 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewHelp_documents extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/joomla_component/view.html.php b/admin/views/joomla_component/view.html.php index 2b041efac..395fbf07d 100644 --- a/admin/views/joomla_component/view.html.php +++ b/admin/views/joomla_component/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewJoomla_component extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php index fffe5e26b..581ed47b6 100644 --- a/admin/views/joomla_components/view.html.php +++ b/admin/views/joomla_components/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewJoomla_components extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/joomla_module/view.html.php b/admin/views/joomla_module/view.html.php index ea379e54b..f10bf587a 100644 --- a/admin/views/joomla_module/view.html.php +++ b/admin/views/joomla_module/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewJoomla_module extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/joomla_module_files_folders_urls/view.html.php b/admin/views/joomla_module_files_folders_urls/view.html.php index 63855e5c5..00be0b441 100644 --- a/admin/views/joomla_module_files_folders_urls/view.html.php +++ b/admin/views/joomla_module_files_folders_urls/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewJoomla_module_files_folders_urls extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/joomla_module_updates/view.html.php b/admin/views/joomla_module_updates/view.html.php index a9881117e..c6e962f58 100644 --- a/admin/views/joomla_module_updates/view.html.php +++ b/admin/views/joomla_module_updates/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewJoomla_module_updates extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/joomla_modules/view.html.php b/admin/views/joomla_modules/view.html.php index 948be6ed0..9af4bd86c 100644 --- a/admin/views/joomla_modules/view.html.php +++ b/admin/views/joomla_modules/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewJoomla_modules extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/joomla_modules_files_folders_urls/view.html.php b/admin/views/joomla_modules_files_folders_urls/view.html.php index 05da3ef63..4dda2bfb6 100644 --- a/admin/views/joomla_modules_files_folders_urls/view.html.php +++ b/admin/views/joomla_modules_files_folders_urls/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewJoomla_modules_files_folders_urls extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/joomla_modules_updates/view.html.php b/admin/views/joomla_modules_updates/view.html.php index d84f6e6eb..fc0801ebd 100644 --- a/admin/views/joomla_modules_updates/view.html.php +++ b/admin/views/joomla_modules_updates/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewJoomla_modules_updates extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/joomla_plugin/view.html.php b/admin/views/joomla_plugin/view.html.php index 058d69e08..b68542231 100644 --- a/admin/views/joomla_plugin/view.html.php +++ b/admin/views/joomla_plugin/view.html.php @@ -80,11 +80,11 @@ class ComponentbuilderViewJoomla_plugin extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/joomla_plugin_files_folders_urls/view.html.php b/admin/views/joomla_plugin_files_folders_urls/view.html.php index 8d493522d..6a307160a 100644 --- a/admin/views/joomla_plugin_files_folders_urls/view.html.php +++ b/admin/views/joomla_plugin_files_folders_urls/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewJoomla_plugin_files_folders_urls extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/joomla_plugin_group/view.html.php b/admin/views/joomla_plugin_group/view.html.php index 362fc7bab..1c57a88a1 100644 --- a/admin/views/joomla_plugin_group/view.html.php +++ b/admin/views/joomla_plugin_group/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewJoomla_plugin_group extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/joomla_plugin_groups/view.html.php b/admin/views/joomla_plugin_groups/view.html.php index 08c910d1f..33169ce65 100644 --- a/admin/views/joomla_plugin_groups/view.html.php +++ b/admin/views/joomla_plugin_groups/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewJoomla_plugin_groups extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/joomla_plugin_updates/view.html.php b/admin/views/joomla_plugin_updates/view.html.php index fd062851c..4c2a67781 100644 --- a/admin/views/joomla_plugin_updates/view.html.php +++ b/admin/views/joomla_plugin_updates/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewJoomla_plugin_updates extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/joomla_plugins/view.html.php b/admin/views/joomla_plugins/view.html.php index c1c5cb0d9..f19d57f16 100644 --- a/admin/views/joomla_plugins/view.html.php +++ b/admin/views/joomla_plugins/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewJoomla_plugins extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/joomla_plugins_files_folders_urls/view.html.php b/admin/views/joomla_plugins_files_folders_urls/view.html.php index 0d82546fb..c61cf818a 100644 --- a/admin/views/joomla_plugins_files_folders_urls/view.html.php +++ b/admin/views/joomla_plugins_files_folders_urls/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewJoomla_plugins_files_folders_urls extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/joomla_plugins_updates/view.html.php b/admin/views/joomla_plugins_updates/view.html.php index 159e65af0..45600ec3f 100644 --- a/admin/views/joomla_plugins_updates/view.html.php +++ b/admin/views/joomla_plugins_updates/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewJoomla_plugins_updates extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/joomla_power/view.html.php b/admin/views/joomla_power/view.html.php index 6ef729bba..429e076b0 100644 --- a/admin/views/joomla_power/view.html.php +++ b/admin/views/joomla_power/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewJoomla_power extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/joomla_powers/view.html.php b/admin/views/joomla_powers/view.html.php index baaeb5e3c..04172e9a6 100644 --- a/admin/views/joomla_powers/view.html.php +++ b/admin/views/joomla_powers/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewJoomla_powers extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/language/view.html.php b/admin/views/language/view.html.php index 86358ed1e..d6604d2a3 100644 --- a/admin/views/language/view.html.php +++ b/admin/views/language/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewLanguage extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/language_translation/view.html.php b/admin/views/language_translation/view.html.php index c5d87e96d..265763456 100644 --- a/admin/views/language_translation/view.html.php +++ b/admin/views/language_translation/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewLanguage_translation extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/language_translations/view.html.php b/admin/views/language_translations/view.html.php index 6355d57b1..14dde5186 100644 --- a/admin/views/language_translations/view.html.php +++ b/admin/views/language_translations/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewLanguage_translations extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/languages/view.html.php b/admin/views/languages/view.html.php index 8cc07ae04..b0db16a5f 100644 --- a/admin/views/languages/view.html.php +++ b/admin/views/languages/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewLanguages extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/layout/view.html.php b/admin/views/layout/view.html.php index 60ce12375..c8bc21dcd 100644 --- a/admin/views/layout/view.html.php +++ b/admin/views/layout/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewLayout extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/layouts/view.html.php b/admin/views/layouts/view.html.php index 09da33509..50ed87326 100644 --- a/admin/views/layouts/view.html.php +++ b/admin/views/layouts/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewLayouts extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/libraries/view.html.php b/admin/views/libraries/view.html.php index 3d0b858cf..bf7a83b60 100644 --- a/admin/views/libraries/view.html.php +++ b/admin/views/libraries/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewLibraries extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/libraries_config/view.html.php b/admin/views/libraries_config/view.html.php index b951737f6..b9a72a9d9 100644 --- a/admin/views/libraries_config/view.html.php +++ b/admin/views/libraries_config/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewLibraries_config extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/libraries_files_folders_urls/view.html.php b/admin/views/libraries_files_folders_urls/view.html.php index 3b41106b1..fccf5bdea 100644 --- a/admin/views/libraries_files_folders_urls/view.html.php +++ b/admin/views/libraries_files_folders_urls/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewLibraries_files_folders_urls extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/library/view.html.php b/admin/views/library/view.html.php index cb3cce3e6..661a7086b 100644 --- a/admin/views/library/view.html.php +++ b/admin/views/library/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewLibrary extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/library_config/view.html.php b/admin/views/library_config/view.html.php index de24924c6..a0b4398d5 100644 --- a/admin/views/library_config/view.html.php +++ b/admin/views/library_config/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewLibrary_config extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/library_files_folders_urls/view.html.php b/admin/views/library_files_folders_urls/view.html.php index 92902355e..ecb87715b 100644 --- a/admin/views/library_files_folders_urls/view.html.php +++ b/admin/views/library_files_folders_urls/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewLibrary_files_folders_urls extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/placeholder/view.html.php b/admin/views/placeholder/view.html.php index 00dfb99d2..6da6edeb8 100644 --- a/admin/views/placeholder/view.html.php +++ b/admin/views/placeholder/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewPlaceholder extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/placeholders/view.html.php b/admin/views/placeholders/view.html.php index ffd20f9b9..5a9626a3b 100644 --- a/admin/views/placeholders/view.html.php +++ b/admin/views/placeholders/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewPlaceholders extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/power/view.html.php b/admin/views/power/view.html.php index e2d96b859..2e294f45b 100644 --- a/admin/views/power/view.html.php +++ b/admin/views/power/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewPower extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/powers/view.html.php b/admin/views/powers/view.html.php index a99fa79eb..9bb639c89 100644 --- a/admin/views/powers/view.html.php +++ b/admin/views/powers/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewPowers extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/repositories/view.html.php b/admin/views/repositories/view.html.php index bd5b772d7..be59f6182 100644 --- a/admin/views/repositories/view.html.php +++ b/admin/views/repositories/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewRepositories extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/repository/view.html.php b/admin/views/repository/view.html.php index 16a48a5dc..9384271f1 100644 --- a/admin/views/repository/view.html.php +++ b/admin/views/repository/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewRepository extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/search/view.html.php b/admin/views/search/view.html.php index 5ebb3befd..12515673c 100644 --- a/admin/views/search/view.html.php +++ b/admin/views/search/view.html.php @@ -108,6 +108,7 @@ class ComponentbuilderViewSearch extends HtmlView throw new \Exception(implode(PHP_EOL, $errors), 500); } + // Display the template parent::display($tpl); } diff --git a/admin/views/server/view.html.php b/admin/views/server/view.html.php index 778db94d7..4dccb7e7d 100644 --- a/admin/views/server/view.html.php +++ b/admin/views/server/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewServer extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/servers/view.html.php b/admin/views/servers/view.html.php index e0d109a49..19b2ac4c6 100644 --- a/admin/views/servers/view.html.php +++ b/admin/views/servers/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewServers extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/site_view/view.html.php b/admin/views/site_view/view.html.php index b6d456fe8..3d8d6ce22 100644 --- a/admin/views/site_view/view.html.php +++ b/admin/views/site_view/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewSite_view extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php index 5f50f1bda..5a088f4d5 100644 --- a/admin/views/site_views/view.html.php +++ b/admin/views/site_views/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewSite_views extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/snippet/view.html.php b/admin/views/snippet/view.html.php index 918479a52..7dde699e9 100644 --- a/admin/views/snippet/view.html.php +++ b/admin/views/snippet/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewSnippet extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/snippet_type/view.html.php b/admin/views/snippet_type/view.html.php index 744d8af81..b8ddc8be7 100644 --- a/admin/views/snippet_type/view.html.php +++ b/admin/views/snippet_type/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewSnippet_type extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/snippet_types/view.html.php b/admin/views/snippet_types/view.html.php index 93099badf..58a11ce86 100644 --- a/admin/views/snippet_types/view.html.php +++ b/admin/views/snippet_types/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewSnippet_types extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php index c8a851d04..20c881619 100644 --- a/admin/views/snippets/view.html.php +++ b/admin/views/snippets/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewSnippets extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/template/view.html.php b/admin/views/template/view.html.php index 2a0bbf283..38309890b 100644 --- a/admin/views/template/view.html.php +++ b/admin/views/template/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewTemplate extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/templates/view.html.php b/admin/views/templates/view.html.php index 8e239f9f3..f07de9445 100644 --- a/admin/views/templates/view.html.php +++ b/admin/views/templates/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewTemplates extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/admin/views/validation_rule/view.html.php b/admin/views/validation_rule/view.html.php index cfe9b0e51..6fbe44aa3 100644 --- a/admin/views/validation_rule/view.html.php +++ b/admin/views/validation_rule/view.html.php @@ -79,11 +79,11 @@ class ComponentbuilderViewValidation_rule extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } diff --git a/admin/views/validation_rules/view.html.php b/admin/views/validation_rules/view.html.php index b9a644efa..0c5cf38b7 100644 --- a/admin/views/validation_rules/view.html.php +++ b/admin/views/validation_rules/view.html.php @@ -85,11 +85,11 @@ class ComponentbuilderViewValidation_rules extends HtmlView throw new Exception(implode("\n", $errors), 500); } - // Display the template - parent::display($tpl); - // Set the document $this->setDocument(); + + // Display the template + parent::display($tpl); } /** diff --git a/componentbuilder.xml b/componentbuilder.xml index ce6549662..c18f66373 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,15 +1,15 @@ COM_COMPONENTBUILDER - 20th September, 2024 + 29th September, 2024 Llewellyn van der Merwe joomla@vdm.io https://dev.vdm.io Copyright (C) 2015 Vast Development Method. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - 3.2.4 + 3.2.5-alpha1 Component Builder (v.3.2.4) +

Component Builder (v.3.2.5-alpha1)

The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time. diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml index 36ba2b7d9..7aa9fb94d 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -196,4 +196,22 @@ https://dev.vdm.io + + Component Builder + Builds Complex Joomla Components + pkg_component_builder + package + site + 3.2.5-alpha1 + https://dev.vdm.io + + https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.5-alpha1.zip + + + alpha + + Llewellyn van der Merwe + https://dev.vdm.io + + \ No newline at end of file diff --git a/libraries/vendor_jcb/VDM.Joomla.Gitea/src/Factory.php b/libraries/vendor_jcb/VDM.Joomla.Gitea/src/Factory.php index 1376a814d..4d8b09dc1 100644 --- a/libraries/vendor_jcb/VDM.Joomla.Gitea/src/Factory.php +++ b/libraries/vendor_jcb/VDM.Joomla.Gitea/src/Factory.php @@ -35,6 +35,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory; */ abstract class Factory extends ExtendingFactory implements FactoryInterface { + /** + * Package Container + * + * @var Container|null + * @since 5.0.3 + **/ + protected static ?Container $container = null; + /** * Create a container object * diff --git a/libraries/vendor_jcb/VDM.Joomla.Openai/src/Factory.php b/libraries/vendor_jcb/VDM.Joomla.Openai/src/Factory.php index 203712e80..c8ee9f142 100644 --- a/libraries/vendor_jcb/VDM.Joomla.Openai/src/Factory.php +++ b/libraries/vendor_jcb/VDM.Joomla.Openai/src/Factory.php @@ -26,6 +26,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory; */ abstract class Factory extends ExtendingFactory implements FactoryInterface { + /** + * Package Container + * + * @var Container|null + * @since 5.0.3 + **/ + protected static ?Container $container = null; + /** * Create a container object * diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Factory.php index a3e8c3cbd..20f397db0 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Factory.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Factory.php @@ -35,14 +35,6 @@ use VDM\Joomla\Interfaces\FactoryInterface; **/ abstract class Factory implements FactoryInterface { - /** - * Global Package Container - * - * @var Container|null - * @since 0.0.0 - **/ - protected static ?Container $container = null; - /** * Get any class from the package container * diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Schema.php b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Schema.php index 0ad261c6c..18e7e02ce 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Schema.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Schema.php @@ -579,41 +579,57 @@ abstract class Schema implements SchemaInterface */ protected function isDataTypeChangeSignificant(string $currentType, string $expectedType): bool { - // Normalize both input types to lowercase for case-insensitive comparison - $currentType = strtolower($currentType); - $expectedType = strtolower($expectedType); + // Normalize both input types to lowercase and remove extra spaces for comparison + $currentType = strtolower(trim($currentType)); + $expectedType = strtolower(trim($expectedType)); - // Regex to extract the base data type and numeric parameters with named groups - $typePattern = '/^(?\w+)(\((?\d+(,\d+)?)\))?/'; + // Regex to extract the base data type and numeric parameters (size and precision) with named groups + $typePattern = '/^(?\w+)(\((?\s*\d+\s*(,\s*\d+\s*)?)\))?/'; // Match types and parameters preg_match($typePattern, $currentType, $currentMatches); preg_match($typePattern, $expectedType, $expectedMatches); - // Compare base types + // Compare base types (datatype without size/precision) if ($currentMatches['datatype'] !== $expectedMatches['datatype']) { return true; // Base types differ } - // Define types where size and other modifiers are irrelevant + // Define numeric types where display width is irrelevant but precision (for DECIMAL) matters $sizeIrrelevantTypes = [ - 'int', 'tinyint', 'smallint', 'mediumint', 'bigint', - 'float', 'double', 'decimal', 'numeric' // Numeric types where display width is irrelevant + 'int', 'tinyint', 'smallint', 'mediumint', 'bigint', + 'float', 'double' // Numeric types where display width is irrelevant ]; - // If the type is not in the size irrelevant list, compare full definitions - if (!in_array($currentMatches['datatype'], $sizeIrrelevantTypes)) + // Handle DECIMAL and NUMERIC types explicitly (precision and scale are relevant) + if (in_array($currentMatches['datatype'], ['decimal', 'numeric'])) { - return $currentType !== $expectedType; // Use full definition for types where size matters + // Extract precision and scale (if present) + if ($currentMatches['params'] !== $expectedMatches['params']) + { + return true; // Precision or scale has changed + } } - // For size irrelevant types, only compare base type, ignoring size and unsigned - $currentBaseType = preg_replace('/\(\d+(,\d+)?\)|unsigned/', '', $currentType); - $expectedBaseType = preg_replace('/\(\d+(,\d+)?\)|unsigned/', '', $expectedType); + // Check if the type is in the list of size-irrelevant types + if (in_array($currentMatches['datatype'], $sizeIrrelevantTypes)) + { + // Remove irrelevant parts like display width and "unsigned" for size-irrelevant types, including extra spaces + $currentBaseType = preg_replace('/\s*\(\s*\d+(\s*,\s*\d+)?\s*\)\s*|\s*unsigned\s*/', '', $currentType); + $expectedBaseType = preg_replace('/\s*\(\s*\d+(\s*,\s*\d+)?\s*\)\s*|\s*unsigned\s*/', '', $expectedType); - // Perform a final comparison for numeric types ignoring size - return $currentBaseType !== $expectedBaseType; + // Compare base types after normalization + return $currentBaseType !== $expectedBaseType; + } + + // For types where size is relevant (e.g., VARCHAR, CHAR, etc.), compare the full definitions + // Normalize size parameters by removing extra spaces around commas, e.g., "decimal(5 , 2)" -> "decimal(5,2)" + $normalizedCurrentType = preg_replace('/\s*,\s*/', ',', $currentType); + $normalizedExpectedType = preg_replace('/\s*,\s*/', ',', $expectedType); + + // Perform a full comparison for types where size matters + return $normalizedCurrentType !== $normalizedExpectedType; } /** @@ -624,7 +640,7 @@ abstract class Schema implements SchemaInterface * @param mixed $currentDefault Current default value. * @param mixed $newDefault The new default value to be set. * - * @return void + * @return bool True if update was successful, false if no update was needed. * @since 3.2.1 * @throws \Exception If there is an error updating column defaults. */ @@ -640,13 +656,38 @@ abstract class Schema implements SchemaInterface $updateTable = 'UPDATE ' . $this->db->quoteName($this->getTable($table)); $dbField = $this->db->quoteName($column); - // Update SQL to set new default on existing rows where the default is currently the old default - $sql = $updateTable . " SET $dbField = $sqlDefault WHERE $dbField IS NULL OR $dbField = ''"; + if (isset($this->columns[$column])) + { + $fieldType = strtoupper($this->columns[$column]->Type); - // Execute the update - $this->db->setQuery($sql); - return $this->db->execute(); - } catch (\Exception $e) { + // If the field is numeric, avoid comparing with empty string + if (strpos($fieldType, 'INT') !== false || + strpos($fieldType, 'FLOAT') !== false || + strpos($fieldType, 'DOUBLE') !== false || + strpos($fieldType, 'DECIMAL') !== false) + { + $whereCondition = "$dbField IS NULL OR $dbField = 0"; + } + else + { + // Default condition for non-numeric fields + $whereCondition = "$dbField IS NULL OR $dbField = ''"; + } + + // Update SQL to set new default on existing rows where the default is currently the old default + $sql = $updateTable . " SET $dbField = $sqlDefault WHERE $whereCondition"; + + // Execute the update + $this->db->setQuery($sql); + return $this->db->execute(); + } + else + { + throw new \Exception("Error: Column $column does not exist in table $table."); + } + } + catch (\Exception $e) + { throw new \Exception("Error: failed to update ($column) column defaults in $table table. " . $e->getMessage()); } } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php index eae8ca031..9184813d4 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php @@ -68,6 +68,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory; */ abstract class Factory extends ExtendingFactory implements FactoryInterface { + /** + * Package Container + * + * @var Container|null + * @since 5.0.3 + **/ + protected static ?Container $container = null; + /** * Current Joomla Version Being Build * diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php index 7804c937d..e72812387 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php @@ -4781,8 +4781,6 @@ class Interpretation extends Fields } $method .= PHP_EOL . Indent::_(2) . "}"; } - $method .= PHP_EOL . PHP_EOL . Indent::_(2) - . "parent::display(\$tpl);"; } return $method; diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Fieldtype/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Fieldtype/Factory.php index 249140f94..7d5a35e53 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Fieldtype/Factory.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Fieldtype/Factory.php @@ -31,6 +31,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory; */ abstract class Factory extends ExtendingFactory implements FactoryInterface { + /** + * Package Container + * + * @var Container|null + * @since 5.0.3 + **/ + protected static ?Container $container = null; + /** * Create a container object * diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Factory.php index fabd0f5e0..0ced36851 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Factory.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/JoomlaPower/Factory.php @@ -31,6 +31,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory; */ abstract class Factory extends ExtendingFactory implements FactoryInterface { + /** + * Package Container + * + * @var Container|null + * @since 5.0.3 + **/ + protected static ?Container $container = null; + /** * Create a container object * diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Factory.php index 58a3468ca..1a1f7dc43 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Factory.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Package/Factory.php @@ -28,6 +28,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory; */ abstract class Factory extends ExtendingFactory implements FactoryInterface { + /** + * Package Container + * + * @var Container|null + * @since 5.0.3 + **/ + protected static ?Container $container = null; + /** * Create a container object * diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Factory.php index c5b08cd7f..cea2a0533 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Factory.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Power/Factory.php @@ -32,6 +32,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory; */ abstract class Factory extends ExtendingFactory implements FactoryInterface { + /** + * Package Container + * + * @var Container|null + * @since 5.0.3 + **/ + protected static ?Container $container = null; + /** * Create a container object * diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Search/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Search/Factory.php index 46223d162..5f14fea5b 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Search/Factory.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Search/Factory.php @@ -28,6 +28,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory; */ abstract class Factory extends ExtendingFactory implements FactoryInterface { + /** + * Package Container + * + * @var Container|null + * @since 5.0.3 + **/ + protected static ?Container $container = null; + /** * Create a container object * diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Data/Factory.php b/libraries/vendor_jcb/VDM.Joomla/src/Data/Factory.php index 25bb3f807..68d1393a5 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Data/Factory.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Data/Factory.php @@ -28,6 +28,14 @@ use VDM\Joomla\Abstraction\Factory as ExtendingFactory; */ abstract class Factory extends ExtendingFactory implements FactoryInterface { + /** + * Package Container + * + * @var Container|null + * @since 5.0.3 + **/ + protected static ?Container $container = null; + /** * Create a container object * diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Data/MultiSubform.php b/libraries/vendor_jcb/VDM.Joomla/src/Data/MultiSubform.php index 4b801654e..d3551c678 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Data/MultiSubform.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Data/MultiSubform.php @@ -130,6 +130,13 @@ final class MultiSubform implements MultiSubformInterface { $items = []; // will delete all existing linked items :( not ideal, but real } + else + { + // make sure the sub-subform:linkValue[data:guid] + // is set with the needed key if possible + // this ensures that new sub-subform data is correctly linked + $this->prepLinkValue($items, $setMap); + } // Save the core data if (!$this->setSubformData($items, $setMap['_core'])) @@ -515,6 +522,45 @@ final class MultiSubform implements MultiSubformInterface } return true; // All checks passed + } + + /** + * Prepare the linkValue needed by the sub-subform + * + * @param array $subform The subform data + * @param array $setMap Mapping data for processing subforms + * + * @return void + * @since 5.0.3 + */ + private function prepLinkValue(array &$subform, array $setMap): void + { + $code_table = null; + foreach ($setMap as $key => $map) + { + if ($key === '_core') + { + $code_table = $map['table'] ?? null; + continue; + } + + if (strpos($map['linkValue'], ':') !== false) + { + [$table, $field] = explode(':', $map['linkValue']); + if ($code_table !== null && + 'guid' === $field && + $table === $code_table) + { + foreach ($subform as &$row) + { + if (empty($row['guid'])) + { + $row['guid'] = $this->subform->table($table)->getGuid($field); + } + } + } + } + } } } diff --git a/script.php b/script.php index 9c186c0b2..ebbe805fd 100644 --- a/script.php +++ b/script.php @@ -10001,7 +10001,7 @@ class Com_ComponentbuilderInstallerScript echo '

-

Upgrade to Version 3.2.4 Was Successful! Let us know if anything is not working as expected.

'; +

Upgrade to Version 3.2.5-alpha1 Was Successful! Let us know if anything is not working as expected.

'; // Set db if not set already. if (!isset($db)) diff --git a/site/views/api/view.html.php b/site/views/api/view.html.php index caaf46e3c..b1ca604df 100644 --- a/site/views/api/view.html.php +++ b/site/views/api/view.html.php @@ -54,6 +54,7 @@ class ComponentbuilderViewApi extends HtmlView throw new \Exception(implode(PHP_EOL, $errors), 500); } + // Display the template parent::display($tpl); }