From 2420b95f917f0579185ca30ea4518eabd6f90f6e Mon Sep 17 00:00:00 2001
From: "madhu.sr" <madhu.sr@vtigersolutions.com>
Date: Fri, 15 Mar 2024 10:41:53 +0530
Subject: [PATCH] #Fixes::158592377::madhusr::picklist color is not reflecting
in the dropdown when there are special characters in picklist value
---
.../v7/modules/Settings/Picklist/resources/Picklist.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/layouts/v7/modules/Settings/Picklist/resources/Picklist.js b/layouts/v7/modules/Settings/Picklist/resources/Picklist.js
index 3243ddd4d..655195511 100644
--- a/layouts/v7/modules/Settings/Picklist/resources/Picklist.js
+++ b/layouts/v7/modules/Settings/Picklist/resources/Picklist.js
@@ -306,7 +306,7 @@ var Settings_Picklist_Js = {
var form = container.find('[name="addItemForm"]');
var params = {
submitHandler: function(form) {
- var specialChars = /[<\>\"\,\[\]\{\}]/;
+ var specialChars = /[\<\>\"\,\[\]\{\}\'\!\@\#\$\%\^\&\*\(\)\+\=\?\|\\\;\:\/]/;
var newValueEle = jQuery('[name="newValue"]', container);
var newValues = newValueEle.val();
var newValueArray = newValues.split(',');
@@ -323,7 +323,7 @@ var Settings_Picklist_Js = {
return false;
}
if (specialChars.test(newValueArray[i])) {
- var errorMessage = app.vtranslate('JS_SPECIAL_CHARACTERS') + " < > \" , [ ] { } " + app.vtranslate('JS_NOT_ALLOWED');
+ var errorMessage = app.vtranslate('JS_SPECIAL_CHARACTERS') + " <>\",[]{}\'!@#$%^&*()+=?|\\;:/ " + app.vtranslate('JS_NOT_ALLOWED');
vtUtils.showValidationMessage(newValueEle, errorMessage, showValidationParams);
return false;
}
@@ -372,7 +372,7 @@ var Settings_Picklist_Js = {
var params = {
submitHandler: function(form) {
var form = jQuery(form);
- var specialChars = /[<\>\"\,\[\]\{\}]/;
+ var specialChars = /[\<\>\"\,\[\]\{\}\'\!\@\#\$\%\^\&\*\(\)\+\=\?\|\\\;\:\/]/;
var newValueEle = jQuery('[name="renamedValue"]',form);
var newValue = jQuery.trim(newValueEle.val());
if(Settings_Picklist_Js.duplicateItemNameCheck(form)) {
@@ -397,7 +397,7 @@ var Settings_Picklist_Js = {
at: 'top left',
container : form
}};
- var errorMessage = app.vtranslate('JS_SPECIAL_CHARACTERS') + " < > \" , [ ] { } " + app.vtranslate('JS_NOT_ALLOWED');
+ var errorMessage = app.vtranslate('JS_SPECIAL_CHARACTERS') + " <>\",[]{}\'!@#$%^&*()+=?|\\;:/ " + app.vtranslate('JS_NOT_ALLOWED');
vtUtils.showValidationMessage(newValueEle, errorMessage, showValidationParams);
return false;
}
--
GitLab