Fixes #503 - VT7 - widget minilist it's not working

Fixes #444 - vt7 dev release - picklist color in Edit / Create view

layouts/v7/modules/Inventory/partials/LineItemsEdit.tpl

@@ -63,8 +63,6 @@
 	{assign var="IS_INDIVIDUAL_TAX_TYPE" value=true}
 {/if}
 
-<input type="hidden" id="customFields" value='{Zend_Json::encode($CUSTOM_FIELDS)}'>
-<input type="hidden" id="customFieldsDefaultValues" value='{Zend_Json::encode($CUSTOM_FIELDS_DEFAULT_VALUES)}'>
 <input type="hidden" class="numberOfCurrencyDecimal" value="{$USER_MODEL->get('no_of_currency_decimals')}" />
 <input type="hidden" name="totalProductCount" id="totalProductCount" value="{$row_no}" />
 <input type="hidden" name="subtotal" id="subtotal" value="" />

layouts/v7/modules/Vtiger/dashboards/MiniListWizard.tpl

@@ -54,7 +54,7 @@
 							<td class="col-lg-4"></td>
 						</tr>
 				   </tbody>
-				   <input type="hidden" id="translatedModuleNames" value='{ZEND_JSON::encode($TRANSLATED_MODULE_NAMES)}'>
+				   <input type="hidden" id="translatedModuleNames" value='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($TRANSLATED_MODULE_NAMES))}'>
 				</table>
 				{include file='ModalFooter.tpl'|@vtemplate_path:$MODULE}
 			</form>

layouts/v7/modules/Vtiger/resources/Field.js

@@ -245,14 +245,39 @@ Vtiger_Field_Js('Vtiger_Picklist_Field_Js',{},{
 		if(typeof pickListValues[' '] == 'undefined' || pickListValues[' '].length <= 0 || pickListValues[' '] != 'Select an Option') {
 			html += '<option value="">Select an Option</option>';
 		}
+
+		var data = this.getData();
+		var picklistColors = data['picklistColors'];
+
+		var fieldName = this.getName();
 		for(var option in pickListValues) {
 			html += '<option value="'+option+'" ';
+
+			var className = '';
+			if (picklistColors[option]) {
+				className = 'picklistColor_'+fieldName+'_'+option.replace(' ', '_');
+				html += 'class="'+className+'"';
+			}
+
 			if(option == selectedOption) {
 				html += ' selected ';
 			}
 			html += '>'+pickListValues[option]+'</option>';
 		}
 		html +='</select>';
+
+		if (picklistColors) {
+			html +='<style type="text/css">';
+			for(option in picklistColors) {
+				var picklistColor = picklistColors[option];
+				if (picklistColor) {
+					className = '.picklistColor_'+fieldName+'_'+option.replace(' ', '_');
+					html += className+'{background-color: '+picklistColor+' !important;}';
+				}
+			}
+			html +='<\style>';
+		}
+
 		var selectContainer = jQuery(html);
 		this.addValidationToElement(selectContainer);
 		return selectContainer;
@@ -319,14 +344,38 @@ Vtiger_Field_Js('Vtiger_Multipicklist_Field_Js',{},{
 		var selectedOption = app.htmlDecode(this.getValue());
 		var selectedOptionsArray = this.getSelectedOptions(selectedOption);
 
+		var data = this.getData();
+		var picklistColors = data['picklistColors'];
+
+		var fieldName = this.getName();
 		for(var option in pickListValues) {
 			html += '<option value="'+option+'" ';
+
+			var className = '';
+			if (picklistColors[option]) {
+				className = 'picklistColor_'+fieldName+'_'+option.replace(' ', '_');
+				html += 'class="'+className+'"';
+			}
+
 			if(jQuery.inArray(option,selectedOptionsArray) != -1){
 				html += ' selected ';
 			}
 			html += '>'+pickListValues[option]+'</option>';
 		}
 		html +='</select>';
+
+		if (picklistColors) {
+			html +='<style type="text/css">';
+			for(option in picklistColors) {
+				var picklistColor = picklistColors[option];
+				if (picklistColor) {
+					className = '.picklistColor_'+fieldName+'_'+option.replace(' ', '_');
+					html += className+'{background-color: '+picklistColor+' !important;}';
+				}
+			}
+			html +='<\style>';
+		}
+
 		var selectContainer = jQuery(html);
 		this.addValidationToElement(selectContainer);
 		return selectContainer;

layouts/v7/modules/Vtiger/uitypes/MultiPicklist.tpl

@@ -14,7 +14,7 @@
 	{assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
 	{assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
 	{assign var="FIELD_VALUE_LIST" value=explode(' |##| ',$FIELD_MODEL->get('fieldvalue'))}
-	{assign var=PICKLIST_COLORS value=$FIELD_MODEL->getPicklistColors()}
+	{assign var=PICKLIST_COLORS value=$FIELD_INFO['picklistColors']}
 	<input type="hidden" name="{$FIELD_MODEL->getFieldName()}" value=""  data-fieldtype="multipicklist"/>
 	<select id="{$MODULE}_{$smarty.request.view}_fieldName_{$FIELD_MODEL->getFieldName()}" multiple class="select2" name="{$FIELD_MODEL->getFieldName()}[]" data-fieldtype="multipicklist" style='width:210px;height:30px;' 
 			{if $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if}

layouts/v7/modules/Vtiger/uitypes/Picklist.tpl

@@ -11,7 +11,7 @@
 {assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
 {assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()}
 {assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
-{assign var=PICKLIST_COLORS value=$FIELD_MODEL->getPicklistColors()}
+{assign var=PICKLIST_COLORS value=$FIELD_INFO['picklistColors']}
 <select data-fieldname="{$FIELD_MODEL->getFieldName()}" data-fieldtype="picklist" class="inputElement select2 {if $OCCUPY_COMPLETE_WIDTH} row {/if}" type="picklist" name="{$FIELD_MODEL->getFieldName()}" {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if} data-selected-value='{$FIELD_MODEL->get('fieldvalue')}'
 	{if $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if}
 	{if count($FIELD_INFO['validator'])}

modules/Vtiger/models/Field.php

@@ -538,6 +538,12 @@ class Vtiger_Field_Model extends Vtiger_Field {
 			} else {
 				$this->fieldInfo['picklistvalues'] = array();
 			}
+
+			$this->fieldInfo['picklistColors'] = array();
+			$picklistColors = $this->getPicklistColors();
+			if ($picklistColors) {
+				$this->fieldInfo['picklistColors'] = $picklistColors;
+			}
 		}
 
 		if($fieldDataType === 'currencyList'){