From 2cb815c4f342445270805315995d7779ccaae74a Mon Sep 17 00:00:00 2001 From: tonypartridge <6GW7iqJ78B> Date: Sat, 24 Mar 2018 21:56:33 +0000 Subject: [PATCH 01/11] Changed none selected to none, to be used when there are none available to select and when none are selected. Set select to be readonly is they cannot select any options --- administrator/language/en-GB/en-GB.ini | 2 +- language/en-GB/en-GB.ini | 2 +- libraries/joomla/form/fields/plugins.php | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index b4078de2faa2d..f8be050e53796 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -863,7 +863,7 @@ JOPTION_ACCESS_SHOW_ALL_LEVELS="Show All Access Levels" JOPTION_ALL_CATEGORIES="- All Categories -" JOPTION_ANY_CATEGORY="Any Category" JOPTION_ANY="Any" -JOPTION_DO_NOT_USE="- None Selected -" +JOPTION_DO_NOT_USE="- None -" JOPTION_FROM_COMPONENT="---From Component---" JOPTION_FROM_MODULE="---From Module---" JOPTION_FROM_TEMPLATE="---From %s Template---" diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini index 652d721b2ea84..6c25ffaa03aeb 100644 --- a/language/en-GB/en-GB.ini +++ b/language/en-GB/en-GB.ini @@ -297,7 +297,7 @@ JLIB_DATABASE_ERROR_DATABASE_CONNECT="Could not connect to database" JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s" JLIB_ERROR_INFINITE_LOOP="Infinite loop detected in JError" -JOPTION_DO_NOT_USE="- None Selected -" +JOPTION_DO_NOT_USE="- None -" JOPTION_SELECT_ACCESS="- Select Access -" JOPTION_SELECT_AUTHOR="- Select Author -" JOPTION_SELECT_CATEGORY="- Select Category -" diff --git a/libraries/joomla/form/fields/plugins.php b/libraries/joomla/form/fields/plugins.php index 422c289747a64..c7ed5dc51232f 100644 --- a/libraries/joomla/form/fields/plugins.php +++ b/libraries/joomla/form/fields/plugins.php @@ -157,4 +157,21 @@ protected function getOptions() return array_merge($parentOptions, $options); } + + /** + * Method to get the field input markup for a generic list. + * Use the multiple attribute to enable multiselect. + * + * @return string The field input markup. + * + * @since 3.7.0 + */ + protected function getInput() + { + + if (count($this->options) === 1 && $this->options[0]->text === JText::_('JOPTION_DO_NOT_USE')) { + $this->readonly = true; + } + return parent::getInput(); + } } From b28128475802e48dcf62eb9ba118e6a5c6ed5e3e Mon Sep 17 00:00:00 2001 From: Tony Partridge Date: Sat, 24 Mar 2018 22:05:38 +0000 Subject: [PATCH 02/11] Update plugins.php --- libraries/joomla/form/fields/plugins.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/joomla/form/fields/plugins.php b/libraries/joomla/form/fields/plugins.php index c7ed5dc51232f..b500a29a48f9b 100644 --- a/libraries/joomla/form/fields/plugins.php +++ b/libraries/joomla/form/fields/plugins.php @@ -164,7 +164,7 @@ protected function getOptions() * * @return string The field input markup. * - * @since 3.7.0 + * @since __DEPLOY__ */ protected function getInput() { From 0dbff9833de7594560f6f93e7d46bcfcbd389e36 Mon Sep 17 00:00:00 2001 From: Tony Partridge Date: Sat, 24 Mar 2018 22:06:31 +0000 Subject: [PATCH 03/11] Update plugins.php --- libraries/joomla/form/fields/plugins.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/joomla/form/fields/plugins.php b/libraries/joomla/form/fields/plugins.php index b500a29a48f9b..df255bc483c95 100644 --- a/libraries/joomla/form/fields/plugins.php +++ b/libraries/joomla/form/fields/plugins.php @@ -164,7 +164,7 @@ protected function getOptions() * * @return string The field input markup. * - * @since __DEPLOY__ + * @since __DEPLOY_VERSION__ */ protected function getInput() { From 24d734c2dde192c7d9d381aecccd192015d2979e Mon Sep 17 00:00:00 2001 From: Tony Partridge Date: Tue, 27 Mar 2018 21:23:09 +0100 Subject: [PATCH 04/11] Update en-GB.ini --- administrator/language/en-GB/en-GB.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index f8be050e53796..b4078de2faa2d 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -863,7 +863,7 @@ JOPTION_ACCESS_SHOW_ALL_LEVELS="Show All Access Levels" JOPTION_ALL_CATEGORIES="- All Categories -" JOPTION_ANY_CATEGORY="Any Category" JOPTION_ANY="Any" -JOPTION_DO_NOT_USE="- None -" +JOPTION_DO_NOT_USE="- None Selected -" JOPTION_FROM_COMPONENT="---From Component---" JOPTION_FROM_MODULE="---From Module---" JOPTION_FROM_TEMPLATE="---From %s Template---" From e0b28b616ee9f7d9e63ffd7d55e2ea7fd6a4cf7e Mon Sep 17 00:00:00 2001 From: Tony Partridge Date: Tue, 27 Mar 2018 21:23:24 +0100 Subject: [PATCH 05/11] Update en-GB.ini --- language/en-GB/en-GB.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini index 6c25ffaa03aeb..652d721b2ea84 100644 --- a/language/en-GB/en-GB.ini +++ b/language/en-GB/en-GB.ini @@ -297,7 +297,7 @@ JLIB_DATABASE_ERROR_DATABASE_CONNECT="Could not connect to database" JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s" JLIB_ERROR_INFINITE_LOOP="Infinite loop detected in JError" -JOPTION_DO_NOT_USE="- None -" +JOPTION_DO_NOT_USE="- None Selected -" JOPTION_SELECT_ACCESS="- Select Access -" JOPTION_SELECT_AUTHOR="- Select Author -" JOPTION_SELECT_CATEGORY="- Select Category -" From bd03d3e47f4874ca7373619bd62068bae8d93478 Mon Sep 17 00:00:00 2001 From: Tony Partridge Date: Tue, 27 Mar 2018 21:24:02 +0100 Subject: [PATCH 06/11] Update plugins.php --- libraries/joomla/form/fields/plugins.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/joomla/form/fields/plugins.php b/libraries/joomla/form/fields/plugins.php index df255bc483c95..9177305070ce4 100644 --- a/libraries/joomla/form/fields/plugins.php +++ b/libraries/joomla/form/fields/plugins.php @@ -168,10 +168,11 @@ protected function getOptions() */ protected function getInput() { - - if (count($this->options) === 1 && $this->options[0]->text === JText::_('JOPTION_DO_NOT_USE')) { + if (count($this->options) === 1 && $this->options[0]->text === JText::_('JOPTION_DO_NOT_USE')) + { $this->readonly = true; } + return parent::getInput(); } } From a86a20560ce466bfb12b07d76aa3b08fe7129e8f Mon Sep 17 00:00:00 2001 From: Tony Partridge Date: Wed, 28 Mar 2018 16:24:52 +0100 Subject: [PATCH 07/11] Update plugins.php --- libraries/joomla/form/fields/plugins.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/joomla/form/fields/plugins.php b/libraries/joomla/form/fields/plugins.php index 9177305070ce4..e2174fb1dd550 100644 --- a/libraries/joomla/form/fields/plugins.php +++ b/libraries/joomla/form/fields/plugins.php @@ -172,7 +172,7 @@ protected function getInput() { $this->readonly = true; } - + return parent::getInput(); } } From 3b51282dd1b8da7019838f6794f86c9790e887e9 Mon Sep 17 00:00:00 2001 From: Tony Partridge Date: Wed, 28 Mar 2018 16:34:39 +0100 Subject: [PATCH 08/11] Update plugins.php --- libraries/joomla/form/fields/plugins.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/libraries/joomla/form/fields/plugins.php b/libraries/joomla/form/fields/plugins.php index e2174fb1dd550..e82f8068b7b88 100644 --- a/libraries/joomla/form/fields/plugins.php +++ b/libraries/joomla/form/fields/plugins.php @@ -159,9 +159,6 @@ protected function getOptions() } /** - * Method to get the field input markup for a generic list. - * Use the multiple attribute to enable multiselect. - * * @return string The field input markup. * * @since __DEPLOY_VERSION__ From 2e87f794721c4d563661fb1f52ebb86e6cbabf03 Mon Sep 17 00:00:00 2001 From: Tony Partridge Date: Wed, 28 Mar 2018 16:49:52 +0100 Subject: [PATCH 09/11] Update plugins.php --- libraries/joomla/form/fields/plugins.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/joomla/form/fields/plugins.php b/libraries/joomla/form/fields/plugins.php index e82f8068b7b88..2406b55f18106 100644 --- a/libraries/joomla/form/fields/plugins.php +++ b/libraries/joomla/form/fields/plugins.php @@ -158,7 +158,9 @@ protected function getOptions() return array_merge($parentOptions, $options); } - /** + /* + * Method to get input and also set field readonly. + * * @return string The field input markup. * * @since __DEPLOY_VERSION__ From 04ef9f75411810abbc412bbca8c64d9b5f063db0 Mon Sep 17 00:00:00 2001 From: Tony Partridge Date: Mon, 2 Apr 2018 20:17:12 +0100 Subject: [PATCH 10/11] Update plugins.php Space/tabbing for drone. --- libraries/joomla/form/fields/plugins.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/joomla/form/fields/plugins.php b/libraries/joomla/form/fields/plugins.php index 2406b55f18106..6040a6be4aa3d 100644 --- a/libraries/joomla/form/fields/plugins.php +++ b/libraries/joomla/form/fields/plugins.php @@ -158,13 +158,13 @@ protected function getOptions() return array_merge($parentOptions, $options); } - /* - * Method to get input and also set field readonly. - * - * @return string The field input markup. - * - * @since __DEPLOY_VERSION__ - */ + /** + * Method to get input and also set field readonly. + * + * @return string The field input markup. + * + * @since __DEPLOY_VERSION__ + **/ protected function getInput() { if (count($this->options) === 1 && $this->options[0]->text === JText::_('JOPTION_DO_NOT_USE')) From b82fdbb357a78c54965a0117b4ab60f7f47046fc Mon Sep 17 00:00:00 2001 From: Tony Partridge Date: Thu, 5 Apr 2018 02:16:36 +0100 Subject: [PATCH 11/11] Update plugins.php --- libraries/joomla/form/fields/plugins.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/joomla/form/fields/plugins.php b/libraries/joomla/form/fields/plugins.php index 6040a6be4aa3d..328137321aaa0 100644 --- a/libraries/joomla/form/fields/plugins.php +++ b/libraries/joomla/form/fields/plugins.php @@ -159,12 +159,12 @@ protected function getOptions() } /** - * Method to get input and also set field readonly. - * - * @return string The field input markup. - * - * @since __DEPLOY_VERSION__ - **/ + * Method to get input and also set field readonly. + * + * @return string The field input markup. + * + * @since __DEPLOY_VERSION__ + */ protected function getInput() { if (count($this->options) === 1 && $this->options[0]->text === JText::_('JOPTION_DO_NOT_USE'))