From 26c1bab373f69579341859c1c1b12ecca8ea9d7f Mon Sep 17 00:00:00 2001 From: Kishori Karale Date: Thu, 5 Jan 2023 16:03:28 +0530 Subject: [PATCH 1/4] Feature #184273 feat: Conditional fields implementation --- .../com_tjucm/site/views/itemform/tmpl/default.php | 1 + .../site/views/itemform/tmpl/default_extrafields.php | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/components/com_tjucm/site/views/itemform/tmpl/default.php b/src/components/com_tjucm/site/views/itemform/tmpl/default.php index 744fe6db..3a286304 100644 --- a/src/components/com_tjucm/site/views/itemform/tmpl/default.php +++ b/src/components/com_tjucm/site/views/itemform/tmpl/default.php @@ -31,6 +31,7 @@ HTMLHelper::script('media/com_tjucm/js/vendor/shim/ays-beforeunload-shim.js'); HTMLHelper::script('administrator/components/com_tjfields/assets/js/tjfields.js'); +HTMLHelper::script('media/jui/js/cms-uncompressed.js'); // Load admin language file $lang = JFactory::getLanguage(); diff --git a/src/components/com_tjucm/site/views/itemform/tmpl/default_extrafields.php b/src/components/com_tjucm/site/views/itemform/tmpl/default_extrafields.php index 75a5e681..67890952 100644 --- a/src/components/com_tjucm/site/views/itemform/tmpl/default_extrafields.php +++ b/src/components/com_tjucm/site/views/itemform/tmpl/default_extrafields.php @@ -53,12 +53,7 @@ ?>
-
- label; ?> -
-
- input; ?> -
+ renderField(); ?> type == 'File') From 2a173f59bab6f57936b7655bf1ddae4a629c0a0d Mon Sep 17 00:00:00 2001 From: Kishori Karale Date: Wed, 11 Jan 2023 11:22:38 +0530 Subject: [PATCH 2/4] Feature #184273 feat: Conditional fields implementation --- src/components/com_tjucm/site/views/itemform/tmpl/default.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/com_tjucm/site/views/itemform/tmpl/default.php b/src/components/com_tjucm/site/views/itemform/tmpl/default.php index 3a286304..744fe6db 100644 --- a/src/components/com_tjucm/site/views/itemform/tmpl/default.php +++ b/src/components/com_tjucm/site/views/itemform/tmpl/default.php @@ -31,7 +31,6 @@ HTMLHelper::script('media/com_tjucm/js/vendor/shim/ays-beforeunload-shim.js'); HTMLHelper::script('administrator/components/com_tjfields/assets/js/tjfields.js'); -HTMLHelper::script('media/jui/js/cms-uncompressed.js'); // Load admin language file $lang = JFactory::getLanguage(); From b883137e2b2f5e6af040733b9b0d4a06c1684342 Mon Sep 17 00:00:00 2001 From: Kishori Karale Date: Tue, 17 Jan 2023 12:28:44 +0530 Subject: [PATCH 3/4] Feature #184273 feat: Conditional fields implementation --- .../com_tjucm/administrator/views/types/tmpl/default.php | 2 ++ .../com_tjucm/languages/administrator/en-GB/en-GB.com_tjucm.ini | 1 + 2 files changed, 3 insertions(+) diff --git a/src/components/com_tjucm/administrator/views/types/tmpl/default.php b/src/components/com_tjucm/administrator/views/types/tmpl/default.php index 94b7824d..38cf1518 100644 --- a/src/components/com_tjucm/administrator/views/types/tmpl/default.php +++ b/src/components/com_tjucm/administrator/views/types/tmpl/default.php @@ -207,6 +207,7 @@ $category_url = JRoute::_('index.php?option=com_categories&extension=' . $item->unique_identifier); $field_group_url = JRoute::_('index.php?option=com_tjfields&view=groups&client=' . $item->unique_identifier); $fields_url = JRoute::_('index.php?option=com_tjfields&view=fields&client=' . $item->unique_identifier . '&extension=' . $item->unique_identifier); + $conditionsUrl = JRoute::_('index.php?option=com_tjfields&view=conditions&client=' . $item->unique_identifier); $type_addnew_data_url = JRoute::_('index.php?option=com_tjucm&view=item&layout=edit&client=' . $item->unique_identifier); $type_data_url = JRoute::_('index.php?option=com_tjucm&view=items&client=' . $item->unique_identifier); @@ -276,6 +277,7 @@  |   |  +  |  diff --git a/src/components/com_tjucm/languages/administrator/en-GB/en-GB.com_tjucm.ini b/src/components/com_tjucm/languages/administrator/en-GB/en-GB.com_tjucm.ini index b95375a3..e7d34514 100644 --- a/src/components/com_tjucm/languages/administrator/en-GB/en-GB.com_tjucm.ini +++ b/src/components/com_tjucm/languages/administrator/en-GB/en-GB.com_tjucm.ini @@ -203,3 +203,4 @@ COM_TJUCM_USE_TJQUEUE_WHILE_COPY_ITEM="Use TjQueue While Copy Item" COM_TJUCM_USE_TJQUEUE_WHILE_COPY_ITEM_DESC="Set to 'Yes' if you want to use TjQueue while copying items" COM_TJUCM_YES="Yes" COM_TJUCM_NO="No" +COM_TJUCM_TYPES_CONDITIONS_URL="Conditions" From d01629ff091add98c9e8c5f79087de43b435ff0b Mon Sep 17 00:00:00 2001 From: Kishori Karale Date: Thu, 2 Feb 2023 10:54:56 +0530 Subject: [PATCH 4/4] Feature #184273 chore: Updated namespaces --- .../com_tjucm/administrator/views/types/tmpl/default.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/com_tjucm/administrator/views/types/tmpl/default.php b/src/components/com_tjucm/administrator/views/types/tmpl/default.php index 38cf1518..99932c5a 100644 --- a/src/components/com_tjucm/administrator/views/types/tmpl/default.php +++ b/src/components/com_tjucm/administrator/views/types/tmpl/default.php @@ -10,6 +10,8 @@ // No direct access defined('_JEXEC') or die; use \Joomla\CMS\Layout\LayoutHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/'); JHtml::_('bootstrap.tooltip'); @@ -207,7 +209,7 @@ $category_url = JRoute::_('index.php?option=com_categories&extension=' . $item->unique_identifier); $field_group_url = JRoute::_('index.php?option=com_tjfields&view=groups&client=' . $item->unique_identifier); $fields_url = JRoute::_('index.php?option=com_tjfields&view=fields&client=' . $item->unique_identifier . '&extension=' . $item->unique_identifier); - $conditionsUrl = JRoute::_('index.php?option=com_tjfields&view=conditions&client=' . $item->unique_identifier); + $conditionsUrl = Route::_('index.php?option=com_tjfields&view=conditions&client=' . $item->unique_identifier); $type_addnew_data_url = JRoute::_('index.php?option=com_tjucm&view=item&layout=edit&client=' . $item->unique_identifier); $type_data_url = JRoute::_('index.php?option=com_tjucm&view=items&client=' . $item->unique_identifier); @@ -277,7 +279,7 @@  |   |  -  |  +  |