diff --git a/CHANGELOG.md b/CHANGELOG.md index 85ee69e60..af66165c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ -# v3.2.2-alpha1 +# v3.2.2-alpha2 + +- Fix permission issue for admin views. + +# v3.2.2-alpha - Fix auto build from SQL in Joomla 4 and 5. diff --git a/README.md b/README.md index 5f926c924..5a297864d 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.2-alpha1) 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.2-alpha2) 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*: 13th May, 2024 -+ *Version*: 3.2.2-alpha1 ++ *Last Build*: 16th May, 2024 ++ *Version*: 3.2.2-alpha2 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **761701** ++ *Line count*: **761760** + *Field count*: **2097** -+ *File count*: **5293** ++ *File count*: **5294** + *Folder count*: **471** > 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 5f926c924..5a297864d 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.2-alpha1) 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.2-alpha2) 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*: 13th May, 2024 -+ *Version*: 3.2.2-alpha1 ++ *Last Build*: 16th May, 2024 ++ *Version*: 3.2.2-alpha2 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **761701** ++ *Line count*: **761760** + *Field count*: **2097** -+ *File count*: **5293** ++ *File count*: **5294** + *Folder count*: **471** > 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/sql/updates/mysql/3.2.2-alpha.sql b/admin/sql/updates/mysql/3.2.2-alpha.sql new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/admin/sql/updates/mysql/3.2.2-alpha.sql @@ -0,0 +1 @@ + diff --git a/componentbuilder.xml b/componentbuilder.xml index 19ef9e965..9f42d33a8 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,15 +1,15 @@ COM_COMPONENTBUILDER - 13th May, 2024 + 16th May, 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.2-alpha1 + 3.2.2-alpha2 Component Builder (v.3.2.2-alpha1) +

Component Builder (v.3.2.2-alpha2)

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 666b9dfd1..6e4ea55aa 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -148,10 +148,28 @@ pkg_component_builder package site - 3.2.2-alpha1 + 3.2.2-alpha https://dev.vdm.io - https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.2-alpha1.zip + https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.2-alpha2.zip + + + alpha + + Llewellyn van der Merwe + https://dev.vdm.io + + + + Component Builder + Builds Complex Joomla Components + pkg_component_builder + package + site + 3.2.2-alpha2 + https://dev.vdm.io + + https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v3.2.2-alpha2.zip alpha diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/AccessSections.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/AccessSections.php index 28fe04300..d59a3ce92 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/AccessSections.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Creator/AccessSections.php @@ -460,7 +460,7 @@ final class AccessSections } } - $this->permission ->set( + $this->permission->set( $custom_admin_view, $customAdminCode, $customAdminCode, $menuControllers, 'customAdmin' ); @@ -661,7 +661,8 @@ final class AccessSections } } } - $this->permission ->set( + + $this->permission->set( $view, $nameView, $nameViews, $menuControllers ); } diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Model/Permissions.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Model/Permissions.php index 3c03e4911..45957f9e6 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Model/Permissions.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Model/Permissions.php @@ -39,7 +39,18 @@ class Permissions if (ArrayHelper::check($item->addpermissions)) { - $item->permissions = array_values($item->addpermissions); + if (isset($item->addpermissions["action"]) && is_array($item->addpermissions["action"]) + && isset($item->addpermissions["implementation"]) && is_array($item->addpermissions["implementation"])) + { + foreach ($item->addpermissions["action"] as $k => $action) + { + $item->permissions[] = ['action' => $action, 'implementation' => $item->addpermissions["implementation"][$k]]; + } + } + else + { + $item->permissions = array_values($item->addpermissions); + } } unset($item->addpermissions); diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Extrusion/Helper/Mapping.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Extrusion/Helper/Mapping.php index c23e83163..ad0c8af1d 100644 --- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Extrusion/Helper/Mapping.php +++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Extrusion/Helper/Mapping.php @@ -34,7 +34,7 @@ class Mapping protected $buildcompsql; public $id; public $name_code; - public array $addadmin_views; + public array $addadmin_views = []; public array $addSql = []; public array $source = []; public array $sql = []; diff --git a/script.php b/script.php index f0353aa27..c2528fd1d 100644 --- a/script.php +++ b/script.php @@ -9810,7 +9810,7 @@ class Com_ComponentbuilderInstallerScript echo '

-

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

'; +

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

'; // Set db if not set already. if (!isset($db))