Merge branch '158592377' into 'master'

#Fixes::158592377::madhusr::picklist color is not reflecting in the dropdown...

See merge request !1117

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;
                 }