From 68769604ddfc01dc0783ed4c88f74dea1b8af121 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Tue, 15 Sep 2020 18:59:20 +0200 Subject: [PATCH] Resolved gh-598 to allow empty prefix as default. --- README.md | 2 +- admin/README.txt | 2 +- admin/config.xml | 2 +- admin/helpers/compiler/e_Interpretation.php | 16 +++++++++------- admin/layouts/fieldtype/fields_fullwidth.php | 8 ++++---- .../server/linked_components_fullwidth.php | 8 ++++---- admin/models/forms/joomla_component.xml | 2 +- componentbuilder.xml | 2 +- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index da5047b70..cae645e20 100644 --- a/README.md +++ b/README.md @@ -144,7 +144,7 @@ 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*: 19th August, 2020 ++ *Last Build*: 15th September, 2020 + *Version*: 2.11.6 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt diff --git a/admin/README.txt b/admin/README.txt index da5047b70..cae645e20 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -144,7 +144,7 @@ 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*: 19th August, 2020 ++ *Last Build*: 15th September, 2020 + *Version*: 2.11.6 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt diff --git a/admin/config.xml b/admin/config.xml index 179308fa8..e2395cdff 100644 --- a/admin/config.xml +++ b/admin/config.xml @@ -205,7 +205,7 @@ label="COM_COMPONENTBUILDER_CONFIG_MENU_PREFIX_LABEL" size="30" maxlength="30" - default="»" + default="" description="COM_COMPONENTBUILDER_CONFIG_MENU_PREFIX_DESCRIPTION" class="text_area" filter="SAFEHTML" diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index b9ac83c42..ceb936a65 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -13463,7 +13463,7 @@ class Interpretation extends Fields $counter++; // add the defaults $body .= PHP_EOL . $this->_t(2) - . "published == 1):?>"; + . "published == 1): ?>"; $body .= PHP_EOL . $this->_t(3) . ''; $body .= PHP_EOL . $this->_t(4) @@ -13477,7 +13477,7 @@ class Interpretation extends Fields $body .= PHP_EOL . $this->_t(3) . ''; $body .= PHP_EOL . $this->_t(2) - . "published == 0):?>"; + . "published == 0): ?>"; $body .= PHP_EOL . $this->_t(3) . ''; $body .= PHP_EOL . $this->_t(4) @@ -13491,7 +13491,7 @@ class Interpretation extends Fields $body .= PHP_EOL . $this->_t(3) . ''; $body .= PHP_EOL . $this->_t(2) - . "published == 2):?>"; + . "published == 2): ?>"; $body .= PHP_EOL . $this->_t(3) . ''; $body .= PHP_EOL . $this->_t(4) @@ -13505,7 +13505,7 @@ class Interpretation extends Fields $body .= PHP_EOL . $this->_t(3) . ''; $body .= PHP_EOL . $this->_t(2) - . "published == -2):?>"; + . "published == -2): ?>"; $body .= PHP_EOL . $this->_t(3) . ''; $body .= PHP_EOL . $this->_t(4) @@ -13730,8 +13730,6 @@ class Interpretation extends Fields // set some V3 attr $data_hide = (2 == $this->footableVersion) ? 'data-hide="phone,tablet"' : 'data-breakpoints="xs sm md"'; - $data_type = (2 == $this->footableVersion) ? 'data-type="numeric"' - : 'data-type="number"'; // add the defaults if (!isset($this->fieldsNames[$viewName_single]['published'])) { @@ -13745,6 +13743,8 @@ class Interpretation extends Fields // add the defaults if (!isset($this->fieldsNames[$viewName_single]['id'])) { + $data_type = (2 == $this->footableVersion) ? 'data-type="numeric"' + : 'data-type="number"'; $head .= PHP_EOL . $this->_t(2) . ''; $head .= PHP_EOL . $this->_t(3) . "getFieldDatabaseName( - $viewName_list, $order_field['field'], 'listJoinBuilder' + $viewName_list, $order_field['field'] + // We Removed This 'listJoinBuilder' as targetArea + // we will keep an eye on this )) !== false) { // default ordering is by publish and ordering diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index 3a4179ca2..b4774005d 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -124,25 +124,25 @@ $can = ComponentbuilderHelper::getActions('field'); escape($item->category_title); ?> - published == 1):?> + published == 1): ?> - published == 0):?> + published == 0): ?> - published == 2):?> + published == 2): ?> - published == -2):?> + published == -2): ?> diff --git a/admin/layouts/server/linked_components_fullwidth.php b/admin/layouts/server/linked_components_fullwidth.php index daa8d8f7c..9a1e38f71 100644 --- a/admin/layouts/server/linked_components_fullwidth.php +++ b/admin/layouts/server/linked_components_fullwidth.php @@ -217,25 +217,25 @@ else - published == 1):?> + published == 1): ?> - published == 0):?> + published == 0): ?> - published == 2):?> + published == 2): ?> - published == -2):?> + published == -2): ?> diff --git a/admin/models/forms/joomla_component.xml b/admin/models/forms/joomla_component.xml index ec7327d5f..987d30650 100644 --- a/admin/models/forms/joomla_component.xml +++ b/admin/models/forms/joomla_component.xml @@ -954,7 +954,7 @@ label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MENU_PREFIX_LABEL" size="30" maxlength="30" - default="»" + default="" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MENU_PREFIX_DESCRIPTION" class="text_area" filter="SAFEHTML" diff --git a/componentbuilder.xml b/componentbuilder.xml index 7fecd3e17..300e10574 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 19th August, 2020 + 15th September, 2020 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com http://www.joomlacomponentbuilder.com