From bb414c980c6610bcd6c1016c199e8b19b63225a1 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 15 Jan 2021 09:13:06 +0200 Subject: [PATCH] Removes the custom component field from JCB. Made some filters to be multiple selection in site & component list view. Adds the combo field more correctly to JCB. --- README.md | 6 +- admin/README.txt | 6 +- admin/config.xml | 4 +- admin/helpers/componentbuilder.php | 6 +- admin/models/fields/components.php | 57 ---------- .../{component.php => joomlacomponent.php} | 8 +- admin/models/fields/joomlacomponents.php | 34 +++--- .../fields/joomlacomponentsfilterauthor.php | 1 - .../joomlacomponentsfiltercompanyname.php | 1 - admin/models/forms/custom_code.xml | 4 +- admin/models/forms/filter_custom_codes.xml | 2 +- .../models/forms/filter_joomla_components.xml | 6 +- admin/models/forms/filter_site_views.xml | 3 +- admin/models/forms/language_translation.xml | 4 +- admin/models/joomla_components.php | 72 +++++++++++- admin/models/site_views.php | 36 +++++- admin/sql/install.mysql.utf8.sql | 104 +++++++++--------- admin/views/custom_codes/view.html.php | 2 +- .../views/joomla_components/tmpl/default.php | 2 + admin/views/site_views/tmpl/default.php | 1 + componentbuilder.xml | 2 +- site/helpers/componentbuilder.php | 6 +- 22 files changed, 209 insertions(+), 158 deletions(-) delete mode 100644 admin/models/fields/components.php rename admin/models/fields/{component.php => joomlacomponent.php} (95%) diff --git a/README.md b/README.md index 52eed3198..6338f2836 100644 --- a/README.md +++ b/README.md @@ -143,13 +143,13 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 6th January, 2021 ++ *Last Build*: 15th January, 2021 + *Version*: 2.12.5 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **291576** ++ *Line count*: **291684** + *Field count*: **1611** -+ *File count*: **1935** ++ *File count*: **1934** + *Folder count*: **322** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/README.txt b/admin/README.txt index 52eed3198..6338f2836 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -143,13 +143,13 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 6th January, 2021 ++ *Last Build*: 15th January, 2021 + *Version*: 2.12.5 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **291576** ++ *Line count*: **291684** + *Field count*: **1611** -+ *File count*: **1935** ++ *File count*: **1934** + *Folder count*: **322** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/config.xml b/admin/config.xml index e1e80d6fe..31a6b5c6e 100644 --- a/admin/config.xml +++ b/admin/config.xml @@ -857,9 +857,9 @@ min="1" showon="development_method:2">