From 1651d4358c7711f30fe9beb9df1ba54cf39d5ef2 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 27 Aug 2021 18:50:37 +0200 Subject: [PATCH] Adds arguments (display) to the class method list view --- README.md | 4 ++-- admin/README.txt | 4 ++-- admin/models/class_methods.php | 2 ++ .../views/class_methods/tmpl/default_body.php | 19 ++++++++++--------- componentbuilder.xml | 2 +- media/js/field.js | 14 ++++++++++++++ 6 files changed, 31 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index afde64752..8bac9f332 100644 --- a/README.md +++ b/README.md @@ -143,11 +143,11 @@ 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*: 11th August, 2021 ++ *Last Build*: 27th August, 2021 + *Version*: 2.12.11 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **292146** ++ *Line count*: **292163** + *Field count*: **1630** + *File count*: **1936** + *Folder count*: **322** diff --git a/admin/README.txt b/admin/README.txt index afde64752..8bac9f332 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -143,11 +143,11 @@ 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*: 11th August, 2021 ++ *Last Build*: 27th August, 2021 + *Version*: 2.12.11 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **292146** ++ *Line count*: **292163** + *Field count*: **1630** + *File count*: **1936** + *Folder count*: **322** diff --git a/admin/models/class_methods.php b/admin/models/class_methods.php index 74ebe9b33..d54322a51 100644 --- a/admin/models/class_methods.php +++ b/admin/models/class_methods.php @@ -141,6 +141,8 @@ class ComponentbuilderModelClass_methods extends JModelList continue; } + // decode arguments + $item->arguments = base64_decode($item->arguments); } } diff --git a/admin/views/class_methods/tmpl/default_body.php b/admin/views/class_methods/tmpl/default_body.php index e2449026e..d54896207 100644 --- a/admin/views/class_methods/tmpl/default_body.php +++ b/admin/views/class_methods/tmpl/default_body.php @@ -58,22 +58,23 @@ $edit = "index.php?option=com_componentbuilder&view=class_methods&task=class_met -
- get('class_method.edit')): ?> - escape($item->name); ?> - checked_out): ?> - name, $item->checked_out_time, 'class_methods.', $canCheckin); ?> - - - escape($item->name); ?> +
+ get('class_method.edit')): ?> + escape($item->name); ?> + checked_out): ?> + name, $item->checked_out_time, 'class_methods.', $canCheckin); ?> + + escape($item->name); ?> + ( + escape($item->arguments); ?>)
visibility); ?> -
joomla_plugin_group) && ComponentbuilderHelper::checkString($item->joomla_plugin_group)): ?> +
joomla_plugin_group) && $item->joomla_plugin_group > 0): ?> extension_type); ?> : escape($item->joomla_plugin_group_name); ?> diff --git a/componentbuilder.xml b/componentbuilder.xml index b20fc17b0..e213ed676 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 11th August, 2021 + 27th August, 2021 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com http://www.joomlacomponentbuilder.com diff --git a/media/js/field.js b/media/js/field.js index 9bb185eab..dba20c9f1 100644 --- a/media/js/field.js +++ b/media/js/field.js @@ -784,6 +784,13 @@ function dbChecker(type){ jQuery('#jform_null_switch').removeAttr('required'); jQuery('#jform_null_switch').removeAttr('aria-required'); jQuery('#jform_null_switch').removeClass('required'); + // remove the store (modeling method) + jQuery('#jform_store-lbl').closest('.control-group').hide(); + jQuery('#jform_store').closest('.control-group').hide(); + updateFieldRequired('store',1); + jQuery('#jform_store').removeAttr('required'); + jQuery('#jform_store').removeAttr('aria-required'); + jQuery('#jform_store').removeClass('required'); // show notice jQuery('.note_no_database_settings_needed').closest('.control-group').show(); jQuery('.note_database_settings_needed').closest('.control-group').hide(); @@ -802,6 +809,13 @@ function dbChecker(type){ jQuery('#jform_null_switch').prop('required','required'); jQuery('#jform_null_switch').attr('aria-required',true); jQuery('#jform_null_switch').addClass('required'); + // remove the store (modeling method) + jQuery('#jform_store-lbl').closest('.control-group').show(); + jQuery('#jform_store').closest('.control-group').show(); + updateFieldRequired('store',0); + jQuery('#jform_store').prop('required','required'); + jQuery('#jform_store').attr('aria-required',true); + jQuery('#jform_store').addClass('required'); // remove notice jQuery('.note_no_database_settings_needed').closest('.control-group').hide(); jQuery('.note_database_settings_needed').closest('.control-group').show();