From d00603355b7b2c5a19195ac68e8c6d98ef6fda65 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Tue, 16 Jan 2018 14:35:54 +0200 Subject: [PATCH] Fixed gh-219 import of JCB packages --- README.md | 8 ++++---- admin/README.txt | 8 ++++---- admin/models/import_joomla_components.php | 14 ++++++++++++++ admin/sql/updates/mysql/2.6.10.sql | 1 + componentbuilder.xml | 4 ++-- componentbuilder_update_server.xml | 17 +++++++++++++++++ script.php | 2 +- 7 files changed, 43 insertions(+), 11 deletions(-) create mode 100644 admin/sql/updates/mysql/2.6.10.sql diff --git a/README.md b/README.md index a9b193996..6cf6ad512 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 safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.10) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.11) 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) @@ -127,12 +127,12 @@ Component Builder is mapped as a component in itself on my local development env + *Name*: [Component Builder](http://joomlacomponentbuilder.com) + *First Build*: 30th April, 2015 + *Last Build*: 16th January, 2018 -+ *Version*: 2.6.10 ++ *Version*: 2.6.11 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **179815** ++ *Line count*: **179847** + *Field count*: **1571** -+ *File count*: **1152** ++ *File count*: **1153** + *Folder count*: **184** > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/README.txt b/admin/README.txt index a9b193996..6cf6ad512 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 safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.10) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.11) 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) @@ -127,12 +127,12 @@ Component Builder is mapped as a component in itself on my local development env + *Name*: [Component Builder](http://joomlacomponentbuilder.com) + *First Build*: 30th April, 2015 + *Last Build*: 16th January, 2018 -+ *Version*: 2.6.10 ++ *Version*: 2.6.11 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **179815** ++ *Line count*: **179847** + *Field count*: **1571** -+ *File count*: **1152** ++ *File count*: **1153** + *Folder count*: **184** > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php index 1e4251d10..301102914 100644 --- a/admin/models/import_joomla_components.php +++ b/admin/models/import_joomla_components.php @@ -1493,6 +1493,20 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy } // remove from this dataset unset($item->addfolders); + // update the add_css + if (isset($item->add_css)) + { + $item->add_css_admin = $item->add_css; + } + // remove from this dataset + unset($item->add_css); + // update the css + if (isset($item->css) && ComponentbuilderHelper::checkString($item->css)) + { + $item->css_admin = $item->css; + } + // remove from this dataset + unset($item->css); // repeatable fields to update $updaterR = array( // repeatablefield => checker diff --git a/admin/sql/updates/mysql/2.6.10.sql b/admin/sql/updates/mysql/2.6.10.sql new file mode 100644 index 000000000..d3f5a12fa --- /dev/null +++ b/admin/sql/updates/mysql/2.6.10.sql @@ -0,0 +1 @@ + diff --git a/componentbuilder.xml b/componentbuilder.xml index b017db248..c91e78d0e 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -7,9 +7,9 @@ http://joomlacomponentbuilder.com Copyright (C) 2015. All Rights Reserved GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - 2.6.10 + 2.6.11 Component Builder (v.2.6.10) +

Component Builder (v.2.6.11)

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 b114aa1ff..32cc05f44 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -339,4 +339,21 @@ http://joomlacomponentbuilder.com + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.11 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.11/JCB_v2.6.11.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + \ No newline at end of file diff --git a/script.php b/script.php index 04d810a3e..4016d9895 100644 --- a/script.php +++ b/script.php @@ -4739,7 +4739,7 @@ class com_componentbuilderInstallerScript echo ' -

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

'; +

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

'; } } }