diff --git a/layouts/v7/modules/Calendar/TaskManagement.tpl b/layouts/v7/modules/Calendar/TaskManagement.tpl
index 1d8bbd978f9c72c61c890251e5e6d7c71d454c95..d8a8e4caef361ba7ab1469b9c8128dee1c3e224e 100644
--- a/layouts/v7/modules/Calendar/TaskManagement.tpl
+++ b/layouts/v7/modules/Calendar/TaskManagement.tpl
@@ -35,8 +35,9 @@
</div>
<div class='field pull-left' style="width:250px;padding-right: 5px;">
{assign var=FIELD_MODEL value=$STATUS_FIELD}
- {assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
- {assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()}
+ {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
+ {assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
+ {assign var=FIELD_INFO value=Vtiger_Util_Helper::toSafeHTML(Zend_Json::encode($FIELD_INFO))}
{assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
<select class="select2 listSearchContributor" name="{$FIELD_MODEL->get('name')}" multiple data-fieldinfo='{$FIELD_INFO|escape}'>
{foreach item=PICKLIST_LABEL key=PICKLIST_KEY from=$PICKLIST_VALUES}
diff --git a/layouts/v7/modules/Calendar/uitypes/ActivityPicklistFieldSearchView.tpl b/layouts/v7/modules/Calendar/uitypes/ActivityPicklistFieldSearchView.tpl
index c69743ceca360cf74b04ffb5c4728d06051aa849..23c012a5921323c55774b862f0326059fd896dd1 100644
--- a/layouts/v7/modules/Calendar/uitypes/ActivityPicklistFieldSearchView.tpl
+++ b/layouts/v7/modules/Calendar/uitypes/ActivityPicklistFieldSearchView.tpl
@@ -8,8 +8,9 @@
*************************************************************************************}
{strip}
- {assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
- {assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()}
+ {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
+ {assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
+ {assign var=FIELD_INFO value=Vtiger_Util_Helper::toSafeHTML(Zend_Json::encode($FIELD_INFO))}
{assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
<div class="select2_search_div">
<input type="text" class="listSearchContributor inputElement select2_input_element"/>
diff --git a/layouts/v7/modules/Calendar/uitypes/StatusPickListFieldSearchView.tpl b/layouts/v7/modules/Calendar/uitypes/StatusPickListFieldSearchView.tpl
index 979ba7f416b03c8459a5219a825b458a9afeaca1..ef81fce1ec6af4f5eee6fc679ca5437a24805751 100644
--- a/layouts/v7/modules/Calendar/uitypes/StatusPickListFieldSearchView.tpl
+++ b/layouts/v7/modules/Calendar/uitypes/StatusPickListFieldSearchView.tpl
@@ -8,19 +8,21 @@
*************************************************************************************}
{strip}
-{assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
-{assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()}
-{assign var=EVENTS_MODULE_MODEL value=Vtiger_Module_Model::getInstance('Events')}
-{assign var=EVENT_STATUS_FIELD_MODEL value=$EVENTS_MODULE_MODEL->getField('eventstatus')}
-{assign var=EVENT_STAUTS_PICKLIST_VALUES value=$EVENT_STATUS_FIELD_MODEL->getPicklistValues()}
-{assign var=PICKLIST_VALUES value=array_merge($FIELD_MODEL->getPicklistValues(),$EVENT_STAUTS_PICKLIST_VALUES)}
-{assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
-<div class="select2_search_div">
- <input type="text" class="listSearchContributor inputElement select2_input_element"/>
- <select class="select2 listSearchContributor" name="{$FIELD_MODEL->get('name')}" multiple data-fieldinfo='{$FIELD_INFO|escape}' style="display:none">
- {foreach item=PICKLIST_LABEL key=PICKLIST_KEY from=$PICKLIST_VALUES}
- <option value="{$PICKLIST_KEY}" {if in_array($PICKLIST_KEY,$SEARCH_VALUES)} selected{/if}>{$PICKLIST_LABEL}</option>
- {/foreach}
- </select>
-</div>
+ {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
+ {assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
+ {assign var=FIELD_INFO value=Vtiger_Util_Helper::toSafeHTML(Zend_Json::encode($FIELD_INFO))}
+
+ {assign var=EVENTS_MODULE_MODEL value=Vtiger_Module_Model::getInstance('Events')}
+ {assign var=EVENT_STATUS_FIELD_MODEL value=$EVENTS_MODULE_MODEL->getField('eventstatus')}
+ {assign var=EVENT_STAUTS_PICKLIST_VALUES value=$EVENT_STATUS_FIELD_MODEL->getPicklistValues()}
+ {assign var=PICKLIST_VALUES value=array_merge($PICKLIST_VALUES, $EVENT_STAUTS_PICKLIST_VALUES)}
+ {assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
+ <div class="select2_search_div">
+ <input type="text" class="listSearchContributor inputElement select2_input_element"/>
+ <select class="select2 listSearchContributor" name="{$FIELD_MODEL->get('name')}" multiple data-fieldinfo='{$FIELD_INFO|escape}' style="display:none">
+ {foreach item=PICKLIST_LABEL key=PICKLIST_KEY from=$PICKLIST_VALUES}
+ <option value="{$PICKLIST_KEY}" {if in_array($PICKLIST_KEY,$SEARCH_VALUES)} selected{/if}>{$PICKLIST_LABEL}</option>
+ {/foreach}
+ </select>
+ </div>
{/strip}
\ No newline at end of file
diff --git a/layouts/v7/modules/Users/uitypes/Picklist.tpl b/layouts/v7/modules/Users/uitypes/Picklist.tpl
index 72a051356343742f174ecaf7fa0bab7c557dfea5..401ecbb6bc21097b754ec0012601b728b2defab6 100644
--- a/layouts/v7/modules/Users/uitypes/Picklist.tpl
+++ b/layouts/v7/modules/Users/uitypes/Picklist.tpl
@@ -10,34 +10,34 @@
********************************************************************************/
-->*}
{strip}
-{assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
-{assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()}
-{assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
-{if $FIELD_MODEL->getFieldName() eq 'defaulteventstatus'}
- {assign var=EVENT_MODULE value=Vtiger_Module_Model::getInstance('Events')}
- {assign var=EVENTSTATUS_FIELD_MODEL value=$EVENT_MODULE->getField('eventstatus')}
- {assign var=PICKLIST_VALUES value=$EVENTSTATUS_FIELD_MODEL->getPicklistValues()}
-{else if $FIELD_MODEL->getFieldName() eq 'defaultactivitytype'}
- {assign var=EVENT_MODULE value=Vtiger_Module_Model::getInstance('Events')}
- {assign var=ACTIVITYTYPE_FIELD_MODEL value=$EVENT_MODULE->getField('activitytype')}
- {assign var=PICKLIST_VALUES value=$ACTIVITYTYPE_FIELD_MODEL->getPicklistValues()}
-{/if}
+ {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
+ {assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
+ {assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
+ {if $FIELD_MODEL->getFieldName() eq 'defaulteventstatus'}
+ {assign var=EVENT_MODULE value=Vtiger_Module_Model::getInstance('Events')}
+ {assign var=EVENTSTATUS_FIELD_MODEL value=$EVENT_MODULE->getField('eventstatus')}
+ {assign var=PICKLIST_VALUES value=$EVENTSTATUS_FIELD_MODEL->getPicklistValues()}
+ {else if $FIELD_MODEL->getFieldName() eq 'defaultactivitytype'}
+ {assign var=EVENT_MODULE value=Vtiger_Module_Model::getInstance('Events')}
+ {assign var=ACTIVITYTYPE_FIELD_MODEL value=$EVENT_MODULE->getField('activitytype')}
+ {assign var=PICKLIST_VALUES value=$ACTIVITYTYPE_FIELD_MODEL->getPicklistValues()}
+ {/if}
-<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'])}
- data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}'
- {/if}
- >
- {if $FIELD_MODEL->isEmptyPicklistOptionAllowed()}<option value="">{vtranslate('LBL_SELECT_OPTION','Vtiger')}</option>{/if}
- {foreach item=PICKLIST_VALUE key=PICKLIST_NAME from=$PICKLIST_VALUES}
- {if $PICKLIST_NAME eq ' ' and ($FIELD_MODEL->get('name') eq 'currency_decimal_separator' or $FIELD_MODEL->get('name') eq 'currency_grouping_separator')}
- {assign var=PICKLIST_VALUE value=vtranslate('Space', $MODULE)}
- {assign var=OPTION_VALUE value=' '}
- {else}
- {assign var=OPTION_VALUE value=Vtiger_Util_Helper::toSafeHTML($PICKLIST_NAME)}
- {/if}
- <option value="{$OPTION_VALUE}" {if decode_html($FIELD_MODEL->get('fieldvalue')) eq decode_html($PICKLIST_NAME)} selected {/if}>{$PICKLIST_VALUE}</option>
- {/foreach}
-</select>
+ <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'])}
+ data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}'
+ {/if}
+ >
+ {if $FIELD_MODEL->isEmptyPicklistOptionAllowed()}<option value="">{vtranslate('LBL_SELECT_OPTION','Vtiger')}</option>{/if}
+ {foreach item=PICKLIST_VALUE key=PICKLIST_NAME from=$PICKLIST_VALUES}
+ {if $PICKLIST_NAME eq ' ' and ($FIELD_MODEL->get('name') eq 'currency_decimal_separator' or $FIELD_MODEL->get('name') eq 'currency_grouping_separator')}
+ {assign var=PICKLIST_VALUE value=vtranslate('Space', $MODULE)}
+ {assign var=OPTION_VALUE value=' '}
+ {else}
+ {assign var=OPTION_VALUE value=Vtiger_Util_Helper::toSafeHTML($PICKLIST_NAME)}
+ {/if}
+ <option value="{$OPTION_VALUE}" {if decode_html($FIELD_MODEL->get('fieldvalue')) eq decode_html($PICKLIST_NAME)} selected {/if}>{$PICKLIST_VALUE}</option>
+ {/foreach}
+ </select>
{/strip}
\ No newline at end of file
diff --git a/layouts/v7/modules/Vtiger/uitypes/MultiPicklist.tpl b/layouts/v7/modules/Vtiger/uitypes/MultiPicklist.tpl
index 2a35d33f8e828d87bee01bd15a71cbe4f9bc4923..bf1e30c8f8a44310ada4a6b8854cef1821411f0e 100644
--- a/layouts/v7/modules/Vtiger/uitypes/MultiPicklist.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/MultiPicklist.tpl
@@ -10,10 +10,10 @@
********************************************************************************/
-->*}
{strip}
- {assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()}
{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_VALUES value=$FIELD_INFO['picklistvalues']}
{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;'
diff --git a/layouts/v7/modules/Vtiger/uitypes/MultiSelectFieldSearchView.tpl b/layouts/v7/modules/Vtiger/uitypes/MultiSelectFieldSearchView.tpl
index 05f82e2cba455ea4d6a1e87b64982d742812cc68..ccbc737bd3420c1ab5305e23c72dfaa61fb7615b 100644
--- a/layouts/v7/modules/Vtiger/uitypes/MultiSelectFieldSearchView.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/MultiSelectFieldSearchView.tpl
@@ -10,8 +10,9 @@
********************************************************************************/
-->*}
{strip}
- {assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
- {assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()}
+ {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
+ {assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
+ {assign var=FIELD_INFO value=Vtiger_Util_Helper::toSafeHTML(Zend_Json::encode($FIELD_INFO))}
{assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
<div class="select2_search_div">
<input type="text" class="listSearchContributor inputElement select2_input_element"/>
diff --git a/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl b/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl
index 47132e1fe6cd3c16841c92be915d4a1aefc0efab..1cff9206065d057ce66cde0c9eae6fadbd65914d 100644
--- a/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl
@@ -10,8 +10,9 @@
********************************************************************************/
-->*}
{strip}
- {assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
- {assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()}
+ {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
+ {assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
+ {assign var=FIELD_INFO value=Vtiger_Util_Helper::toSafeHTML(Zend_Json::encode($FIELD_INFO))}
{assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
<div class="select2_search_div">
<input type="text" class="listSearchContributor inputElement select2_input_element"/>
diff --git a/layouts/v7/modules/Vtiger/uitypes/Picklist.tpl b/layouts/v7/modules/Vtiger/uitypes/Picklist.tpl
index cceae5116b986121628fee490479d98977677c01..49fb9d5726ddcc8e894702994cf0375d7b413224 100644
--- a/layouts/v7/modules/Vtiger/uitypes/Picklist.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/Picklist.tpl
@@ -9,8 +9,8 @@
{strip}
{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_VALUES value=$FIELD_INFO['picklistvalues']}
{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}
diff --git a/layouts/v7/modules/Vtiger/uitypes/Salutation.tpl b/layouts/v7/modules/Vtiger/uitypes/Salutation.tpl
index f8e1e08ddb6637cf5759cd59be3c2c6e35f68473..864bc972b37e9c47387bd08526c4011ced7d477a 100644
--- a/layouts/v7/modules/Vtiger/uitypes/Salutation.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/Salutation.tpl
@@ -1,35 +1,35 @@
-{*<!--
-/*********************************************************************************
- ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is: vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- *
- ********************************************************************************/
--->*}
+{*+**********************************************************************************
+* The contents of this file are subject to the vtiger CRM Public License Version 1.1
+* ("License"); You may not use this file except in compliance with the License
+* The Original Code is: vtiger CRM Open Source
+* The Initial Developer of the Original Code is vtiger.
+* Portions created by vtiger are Copyright (C) vtiger.
+* All Rights Reserved.
+*************************************************************************************}
+
{strip}
-{if $SALUTATION_FIELD_MODEL}
-{assign var=PICKLIST_VALUES value=$SALUTATION_FIELD_MODEL->getPicklistValues()}
-{assign var="SALUTATION_VALIDATOR" value=$SALUTATION_FIELD_MODEL->getValidator()}
-<select class="inputElement select2" style="width:78px;" name="{$SALUTATION_FIELD_MODEL->get('name')}" >
- {if $SALUTATION_FIELD_MODEL->isEmptyPicklistOptionAllowed()}<option value="">{vtranslate('LBL_NONE', $MODULE)}</option>{/if}
- {foreach item=PICKLIST_VALUE key=PICKLIST_NAME from=$PICKLIST_VALUES}
- <option value="{Vtiger_Util_Helper::toSafeHTML($PICKLIST_NAME)}" {if trim(decode_html($SALUTATION_FIELD_MODEL->get('fieldvalue'))) eq trim($PICKLIST_NAME)} selected {/if}>{$PICKLIST_VALUE}</option>
- {/foreach}
-</select>
-{/if}
+ {if $SALUTATION_FIELD_MODEL}
+ {assign var=PICKLIST_VALUES value=$SALUTATION_FIELD_MODEL->getPicklistValues()}
+ {assign var="SALUTATION_VALIDATOR" value=$SALUTATION_FIELD_MODEL->getValidator()}
+ <select class="inputElement select2" style="width:78px;" name="{$SALUTATION_FIELD_MODEL->get('name')}" >
+ {if $SALUTATION_FIELD_MODEL->isEmptyPicklistOptionAllowed()}<option value="">{vtranslate('LBL_NONE', $MODULE)}</option>{/if}
+ {foreach item=PICKLIST_VALUE key=PICKLIST_NAME from=$PICKLIST_VALUES}
+ <option value="{Vtiger_Util_Helper::toSafeHTML($PICKLIST_NAME)}" {if trim(decode_html($SALUTATION_FIELD_MODEL->get('fieldvalue'))) eq trim($PICKLIST_NAME)} selected {/if}>{$PICKLIST_VALUE}</option>
+ {/foreach}
+ </select>
+ {/if}
-{assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
-{assign var="FIELD_NAME" value=$FIELD_MODEL->get('name')}
-{assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
-<input {if $SALUTATION_FIELD_MODEL} style="width:120px;" {/if} id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" type="text" class="inputElement {if $FIELD_MODEL->isNameField()}nameField{/if}" name="{$FIELD_MODEL->getFieldName()}" value="{$FIELD_MODEL->get('fieldvalue')}"
-{if $FIELD_MODEL->get('uitype') eq '3' || $FIELD_MODEL->get('uitype') eq '4'} readonly {/if} {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if}
-{if $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if}
-{if count($FIELD_INFO['validator'])}
- data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}'
-{/if}
-/>
-{* TODO - Handler Ticker Symbol field *}
+ {assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
+ {assign var="FIELD_NAME" value=$FIELD_MODEL->get('name')}
+ {assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
+ <input id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" type="text" name="{$FIELD_MODEL->getFieldName()}" value="{$FIELD_MODEL->get('fieldvalue')}"
+ class="inputElement {if $FIELD_MODEL->isNameField()}nameField{/if}"
+ {if $SALUTATION_FIELD_MODEL} style="width:120px;" {/if}
+ {if $FIELD_MODEL->get('uitype') eq '3' || $FIELD_MODEL->get('uitype') eq '4'} readonly {/if} {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if}
+ {if $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if}
+ {if count($FIELD_INFO['validator'])}
+ data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}'
+ {/if}
+ />
+ {* TODO - Handler Ticker Symbol field *}
{/strip}
\ No newline at end of file
diff --git a/packages/vtiger/optional/Projects.zip b/packages/vtiger/optional/Projects.zip
index e0c3fbc5bd31555c3fff35e39f9226bb2ace81d4..ff52b20d766a1f0c8084fecb86c87fb0d4599f5f 100644
Binary files a/packages/vtiger/optional/Projects.zip and b/packages/vtiger/optional/Projects.zip differ
diff --git a/packages/vtiger/optional/Webforms.zip b/packages/vtiger/optional/Webforms.zip
index d4fdb86106254bc68575a64a84cf76a067f33f57..70fafdb5aa4dd556fe6a17cd660f0580a74834c7 100644
Binary files a/packages/vtiger/optional/Webforms.zip and b/packages/vtiger/optional/Webforms.zip differ
diff --git a/pkg/vtiger/modules/Projects/Project/layouts/v7/modules/Project/SummaryViewWidgets.tpl b/pkg/vtiger/modules/Projects/Project/layouts/v7/modules/Project/SummaryViewWidgets.tpl
index df30c1aa09159fa46ea5db9828b874ade37d885e..1a0ee1ff182b4693143d532285ea6d79c9b8f718 100644
--- a/pkg/vtiger/modules/Projects/Project/layouts/v7/modules/Project/SummaryViewWidgets.tpl
+++ b/pkg/vtiger/modules/Projects/Project/layouts/v7/modules/Project/SummaryViewWidgets.tpl
@@ -146,8 +146,9 @@
<div class="pull-left">
{assign var=RELATED_MODULE_MODEL value=Vtiger_Module_Model::getInstance('HelpDesk')}
{assign var=FIELD_MODEL value=$RELATED_MODULE_MODEL->getField('ticketstatus')}
- {assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
- {assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()}
+ {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
+ {assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
+ {assign var=FIELD_INFO value=Vtiger_Util_Helper::toSafeHTML(Zend_Json::encode($FIELD_INFO))}
{assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
<select class="select2" name="{$FIELD_MODEL->get('name')}" data-validation-engine="validate[{if $FIELD_MODEL->isMandatory() eq true} required,{/if}funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" data-fieldinfo='{$FIELD_INFO|escape}' {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if} >
<option value="">{vtranslate('LBL_SELECT_STATUS',$MODULE_NAME)}</option>
@@ -211,8 +212,9 @@
<div class="widget_filter clearfix">
{if $PROGRESS_FIELD_MODEL->isViewableInDetailView()}
<div class="pull-left marginRight15">
- {assign var="FIELD_INFO" value=Zend_Json::encode($PROGRESS_FIELD_MODEL->getFieldInfo())}
- {assign var=PICKLIST_VALUES value=$PROGRESS_FIELD_MODEL->getPicklistValues()}
+ {assign var=FIELD_INFO value=$PROGRESS_FIELD_MODEL->getFieldInfo()}
+ {assign var=PICKLIST_VALUES value=$PROGRESS_FIELD_MODEL['picklistvalues']}
+ {assign var=FIELD_INFO value=Vtiger_Util_Helper::toSafeHTML(Zend_Json::encode($FIELD_INFO))}
{assign var="SPECIAL_VALIDATOR" value=$PROGRESS_FIELD_MODEL->getValidator()}
<select class="select2" name="{$PROGRESS_FIELD_MODEL->get('name')}" data-validation-engine="validate[{if $PROGRESS_FIELD_MODEL->isMandatory() eq true} required,{/if}funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" data-fieldinfo='{$FIELD_INFO|escape}' {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if} >
<option value="">{vtranslate('LBL_SELECT_PROGRESS',$MODULE_NAME)}</option>
@@ -225,8 +227,9 @@
{if $STATUS_FIELD_MODEL->isViewableInDetailView()}
<div class="pull-left marginRight15">
- {assign var="FIELD_INFO" value=Zend_Json::encode($STATUS_FIELD_MODEL->getFieldInfo())}
- {assign var=PICKLIST_VALUES value=$STATUS_FIELD_MODEL->getPicklistValues()}
+ {assign var=FIELD_INFO value=$STATUS_FIELD_MODEL->getFieldInfo()}
+ {assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
+ {assign var=FIELD_INFO value=Vtiger_Util_Helper::toSafeHTML(Zend_Json::encode($FIELD_INFO))}
{assign var="SPECIAL_VALIDATOR" value=$STATUS_FIELD_MODEL->getValidator()}
<select class="select2" name="{$STATUS_FIELD_MODEL->get('name')}" data-validation-engine="validate[{if $STATUS_FIELD_MODEL->isMandatory() eq true} required,{/if}funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" data-fieldinfo='{$FIELD_INFO|escape}' {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if} >
<option value="">{vtranslate('LBL_SELECT_STATUS',$MODULE_NAME)}</option>
diff --git a/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/ShowForm.tpl b/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/ShowForm.tpl
index 8328f1bb79c2a0e440da0e866feb6c1853332e7c..7a7e48fd22389404aff2b657d5c5c836adbc4373 100644
--- a/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/ShowForm.tpl
+++ b/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/ShowForm.tpl
@@ -38,8 +38,9 @@
{if $FIELD_MODEL->get('hidden') neq 1}<td><label>{vtranslate(decode_html($FIELD_MODEL->get('label')), {$SOURCE_MODULE})}{if $FIELD_MODEL->get('required') eq 1}*{/if}</label></td>{/if}
<td>
{if ($DATA_TYPE eq 'picklist' || $DATA_TYPE eq 'multipicklist')}
- {assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
- {assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()}
+ {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
+ {assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
+ {assign var=FIELD_INFO value=Vtiger_Util_Helper::toSafeHTML(Zend_Json::encode($FIELD_INFO))}
{assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
{assign var=PICKLIST_NAME value=$FIELD_MODEL->get('name')}
{if Settings_Webforms_Record_Model::isCustomField($FIELD_NAME)}