diff --git a/layouts/v7/modules/Vtiger/resources/Field.js b/layouts/v7/modules/Vtiger/resources/Field.js index 55043e606a68be2867b22ea81cf828f2e1f71d43..4b08191d31fe5cf3c79f0ee1dbd868e7e77a7b45 100644 --- a/layouts/v7/modules/Vtiger/resources/Field.js +++ b/layouts/v7/modules/Vtiger/resources/Field.js @@ -243,7 +243,7 @@ Vtiger_Field_Js('Vtiger_Picklist_Field_Js',{},{ var selectedOption = app.htmlDecode(this.getValue()); if(typeof pickListValues[' '] == 'undefined' || pickListValues[' '].length <= 0 || pickListValues[' '] != 'Select an Option') { - html += '<option value="">Select an Option</option>'; + html += '<option value="">'+app.vtranslate('JS_SELECT_OPTION')+'</option>'; } var data = this.getData(); @@ -253,10 +253,12 @@ Vtiger_Field_Js('Vtiger_Picklist_Field_Js',{},{ for(var option in pickListValues) { html += '<option value="'+option+'" '; - var className = ''; - if (picklistColors[option]) { - className = 'picklistColor_'+fieldName+'_'+option.replace(' ', '_'); - html += 'class="'+className+'"'; + if (picklistColors) { + var className = ''; + if (picklistColors[option]) { + className = 'picklistColor_'+fieldName+'_'+option.replace(' ', '_'); + html += 'class="'+className+'"'; + } } if(option == selectedOption) { @@ -351,10 +353,12 @@ Vtiger_Field_Js('Vtiger_Multipicklist_Field_Js',{},{ for(var option in pickListValues) { html += '<option value="'+option+'" '; - var className = ''; - if (picklistColors[option]) { - className = 'picklistColor_'+fieldName+'_'+option.replace(' ', '_'); - html += 'class="'+className+'"'; + if (picklistColors) { + var className = ''; + if (picklistColors[option]) { + className = 'picklistColor_'+fieldName+'_'+option.replace(' ', '_'); + html += 'class="'+className+'"'; + } } if(jQuery.inArray(option,selectedOptionsArray) != -1){