From 63a889cea4aeaae4bd022a4ddd5a832bf9bf6314 Mon Sep 17 00:00:00 2001
From: paritshivani <58217306+paritshivani@users.noreply.github.com>
Date: Mon, 17 Feb 2020 15:20:54 +0530
Subject: [PATCH] Bug #11 fix: hide Select User Groups field and is_blacklist
field when global is set to yes (#12)
* Bug #157602 fix: hide Select User Groups field and is_blacklist field when global is set to yes
* Bug #157602 fix: hide Select User Groups field and is_blacklist field when global is set to yes
* Bug #157602 fix: hide Select User Groups field and is_blacklist field when global is set to yes
* Bug #157602 fix: hide Select User Groups field and is_blacklist field when global is set to yes
---
.../com_tc/administrator/models/forms/content.xml | 4 ++--
.../administrator/models/forms/filter_contents.xml | 2 +-
.../administrator/views/content/tmpl/edit.php | 13 +++++++------
.../languages/administrator/en-GB/en-GB.com_tc.ini | 10 +++++-----
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/components/com_tc/administrator/models/forms/content.xml b/src/components/com_tc/administrator/models/forms/content.xml
index 82f6432..d65efa6 100755
--- a/src/components/com_tc/administrator/models/forms/content.xml
+++ b/src/components/com_tc/administrator/models/forms/content.xml
@@ -28,8 +28,8 @@
-
-
+
+
diff --git a/src/components/com_tc/administrator/models/forms/filter_contents.xml b/src/components/com_tc/administrator/models/forms/filter_contents.xml
index 3dc19d4..a71a9fa 100644
--- a/src/components/com_tc/administrator/models/forms/filter_contents.xml
+++ b/src/components/com_tc/administrator/models/forms/filter_contents.xml
@@ -30,4 +30,4 @@
-
+
diff --git a/src/components/com_tc/administrator/views/content/tmpl/edit.php b/src/components/com_tc/administrator/views/content/tmpl/edit.php
index 9a3cf1f..6911e95 100755
--- a/src/components/com_tc/administrator/views/content/tmpl/edit.php
+++ b/src/components/com_tc/administrator/views/content/tmpl/edit.php
@@ -45,7 +45,7 @@
if (tc_id)
{
- jQuery('#jform_version_id').attr('readonly', true);
+ jQuery('#jform_version').attr('readonly', true);
jQuery('#jform_client_id').attr('readonly', true);
return true;
@@ -61,8 +61,8 @@
if (value <= 0)
{
- alert('escape(JText::_('JGLOBAL_VALIDATION_FORM_ZERO_VERSION_TC')); ?>');
- jQuery('#jform_version_id').val('');
+ alert('escape(JText::_('COM_TC_VALIDATION_FORM_ZERO_VERSION_TC')); ?>');
+ jQuery('#jform_version').val('');
return false;
}
@@ -90,7 +90,7 @@ function checkVersionClient()
return true;
}
- var tcVersion = jQuery("#jform_version_id").val();
+ var tcVersion = jQuery("#jform_version").val();
var tcClient = jQuery("#jform_client_id").val();
var valid = false;
@@ -112,8 +112,9 @@ function(data) {
valid = true;
}
else if (tcVersion <= data) {
- alert('' + data + '');
- jQuery('#jform_version_id').val('');
+ alert(''+ tcClient +' - '+ data +
+ '');
+ jQuery('#jform_version').val('');
valid = false;
}
diff --git a/src/components/com_tc/languages/administrator/en-GB/en-GB.com_tc.ini b/src/components/com_tc/languages/administrator/en-GB/en-GB.com_tc.ini
index 133fec2..696cfd4 100755
--- a/src/components/com_tc/languages/administrator/en-GB/en-GB.com_tc.ini
+++ b/src/components/com_tc/languages/administrator/en-GB/en-GB.com_tc.ini
@@ -91,12 +91,12 @@ COM_TC_FORM_LBL_CONTENT_SELECT_USER_GROUP="Select User Groups"
COM_TC_FORM_LBL_CONTENT_SELECT_USER_GROUP_DESC="Select user groups for T&C"
COM_TC_FORM_LBL_CONTENT_URL_PATTERN="URL Pattern"
COM_TC_FORM_LBL_CONTENT_URL_PATTERN_DESC="URL Pattern is used to store option & view of your URL Ex. Option = 'com_ekcontent' & view = 'content'"
-JGLOBAL_VALIDATION_FORM_INVALID_TC="This Version & Client are already stored, please enter another Version & Client"
+COM_TC_VALIDATION_FORM_INVALID_TC="This Version & Client are already stored, please enter another Version & Client"
COM_TC_TITLE_PERMISSIONS="Access Control"
-JGLOBAL_VALIDATION_FORM_LATEST_VERSION_TC ="Latest version of this T&C Client is "
-JGLOBAL_VALIDATION_FORM_GREATER_VERSION_TC =" please enter greater version"
-JGLOBAL_VALIDATION_FORM_ZERO_VERSION_TC ="Plesase enter version is greater than zero or previous version"
-JGLOBAL_VALIDATION_FORM_INVALID_VERSION ="Please enter version as integer or float value"
+COM_TC_VALIDATION_FORM_LATEST_VERSION_TC ="Latest version of this T&C "
+COM_TC_VALIDATION_FORM_GREATER_VERSION_TC =" please enter greater version"
+COM_TC_VALIDATION_FORM_ZERO_VERSION_TC ="Plesase enter version is greater than zero or previous version"
+COM_TC_VALIDATION_FORM_INVALID_VERSION ="Please enter version as integer or float value"
COM_TC_CONTENTS_LATEST="Latest"
COM_TC_CONTENTS_ALL="All"
COM_TC_CONTENTS_FILTER_PUBLISHED="Status"