Skip to content
Snippets Groups Projects
Commit 6b44dadc authored by Satish's avatar Satish
Browse files

Fixes #466 - vt7 dev release - Missing quotation marks in Picklist.tpl

parent 8fed4eeb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 104 additions and 94 deletions
layouts/v7/modules/Calendar/TaskManagement.tpl
+ 3
− 2
View file @ 6b44dadc
...@@ -35,8 +35,9 @@ ...@@ -35,8 +35,9 @@
</div> </div>
<div class='field pull-left' style="width:250px;padding-right: 5px;"> <div class='field pull-left' style="width:250px;padding-right: 5px;">
{assign var=FIELD_MODEL value=$STATUS_FIELD} {assign var=FIELD_MODEL value=$STATUS_FIELD}
{assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())} {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
{assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()} {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'])} {assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
<select class="select2 listSearchContributor" name="{$FIELD_MODEL->get('name')}" multiple data-fieldinfo='{$FIELD_INFO|escape}'> <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} {foreach item=PICKLIST_LABEL key=PICKLIST_KEY from=$PICKLIST_VALUES}
......
layouts/v7/modules/Calendar/uitypes/ActivityPicklistFieldSearchView.tpl
+ 3
− 2
View file @ 6b44dadc
...@@ -8,8 +8,9 @@ ...@@ -8,8 +8,9 @@
*************************************************************************************} *************************************************************************************}
{strip} {strip}
{assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())} {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
{assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()} {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'])} {assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
<div class="select2_search_div"> <div class="select2_search_div">
<input type="text" class="listSearchContributor inputElement select2_input_element"/> <input type="text" class="listSearchContributor inputElement select2_input_element"/>
......
layouts/v7/modules/Calendar/uitypes/StatusPickListFieldSearchView.tpl
+ 17
− 15
View file @ 6b44dadc
...@@ -8,19 +8,21 @@ ...@@ -8,19 +8,21 @@
*************************************************************************************} *************************************************************************************}
{strip} {strip}
{assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())} {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
{assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()} {assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
{assign var=EVENTS_MODULE_MODEL value=Vtiger_Module_Model::getInstance('Events')} {assign var=FIELD_INFO value=Vtiger_Util_Helper::toSafeHTML(Zend_Json::encode($FIELD_INFO))}
{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=EVENTS_MODULE_MODEL value=Vtiger_Module_Model::getInstance('Events')}
{assign var=PICKLIST_VALUES value=array_merge($FIELD_MODEL->getPicklistValues(),$EVENT_STAUTS_PICKLIST_VALUES)} {assign var=EVENT_STATUS_FIELD_MODEL value=$EVENTS_MODULE_MODEL->getField('eventstatus')}
{assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])} {assign var=EVENT_STAUTS_PICKLIST_VALUES value=$EVENT_STATUS_FIELD_MODEL->getPicklistValues()}
<div class="select2_search_div"> {assign var=PICKLIST_VALUES value=array_merge($PICKLIST_VALUES, $EVENT_STAUTS_PICKLIST_VALUES)}
<input type="text" class="listSearchContributor inputElement select2_input_element"/> {assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
<select class="select2 listSearchContributor" name="{$FIELD_MODEL->get('name')}" multiple data-fieldinfo='{$FIELD_INFO|escape}' style="display:none"> <div class="select2_search_div">
{foreach item=PICKLIST_LABEL key=PICKLIST_KEY from=$PICKLIST_VALUES} <input type="text" class="listSearchContributor inputElement select2_input_element"/>
<option value="{$PICKLIST_KEY}" {if in_array($PICKLIST_KEY,$SEARCH_VALUES)} selected{/if}>{$PICKLIST_LABEL}</option> <select class="select2 listSearchContributor" name="{$FIELD_MODEL->get('name')}" multiple data-fieldinfo='{$FIELD_INFO|escape}' style="display:none">
{/foreach} {foreach item=PICKLIST_LABEL key=PICKLIST_KEY from=$PICKLIST_VALUES}
</select> <option value="{$PICKLIST_KEY}" {if in_array($PICKLIST_KEY,$SEARCH_VALUES)} selected{/if}>{$PICKLIST_LABEL}</option>
</div> {/foreach}
</select>
</div>
{/strip} {/strip}
\ No newline at end of file
layouts/v7/modules/Users/uitypes/Picklist.tpl
+ 29
− 29
View file @ 6b44dadc
...@@ -10,34 +10,34 @@ ...@@ -10,34 +10,34 @@
********************************************************************************/ ********************************************************************************/
-->*} -->*}
{strip} {strip}
{assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()} {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
{assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()} {assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
{assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()} {assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
{if $FIELD_MODEL->getFieldName() eq 'defaulteventstatus'} {if $FIELD_MODEL->getFieldName() eq 'defaulteventstatus'}
{assign var=EVENT_MODULE value=Vtiger_Module_Model::getInstance('Events')} {assign var=EVENT_MODULE value=Vtiger_Module_Model::getInstance('Events')}
{assign var=EVENTSTATUS_FIELD_MODEL value=$EVENT_MODULE->getField('eventstatus')} {assign var=EVENTSTATUS_FIELD_MODEL value=$EVENT_MODULE->getField('eventstatus')}
{assign var=PICKLIST_VALUES value=$EVENTSTATUS_FIELD_MODEL->getPicklistValues()} {assign var=PICKLIST_VALUES value=$EVENTSTATUS_FIELD_MODEL->getPicklistValues()}
{else if $FIELD_MODEL->getFieldName() eq 'defaultactivitytype'} {else if $FIELD_MODEL->getFieldName() eq 'defaultactivitytype'}
{assign var=EVENT_MODULE value=Vtiger_Module_Model::getInstance('Events')} {assign var=EVENT_MODULE value=Vtiger_Module_Model::getInstance('Events')}
{assign var=ACTIVITYTYPE_FIELD_MODEL value=$EVENT_MODULE->getField('activitytype')} {assign var=ACTIVITYTYPE_FIELD_MODEL value=$EVENT_MODULE->getField('activitytype')}
{assign var=PICKLIST_VALUES value=$ACTIVITYTYPE_FIELD_MODEL->getPicklistValues()} {assign var=PICKLIST_VALUES value=$ACTIVITYTYPE_FIELD_MODEL->getPicklistValues()}
{/if} {/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')}' <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 $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if}
{if count($FIELD_INFO['validator'])} {if count($FIELD_INFO['validator'])}
data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}' data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}'
{/if} {/if}
> >
{if $FIELD_MODEL->isEmptyPicklistOptionAllowed()}<option value="">{vtranslate('LBL_SELECT_OPTION','Vtiger')}</option>{/if} {if $FIELD_MODEL->isEmptyPicklistOptionAllowed()}<option value="">{vtranslate('LBL_SELECT_OPTION','Vtiger')}</option>{/if}
{foreach item=PICKLIST_VALUE key=PICKLIST_NAME from=$PICKLIST_VALUES} {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')} {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=PICKLIST_VALUE value=vtranslate('Space', $MODULE)}
{assign var=OPTION_VALUE value='&nbsp;'} {assign var=OPTION_VALUE value='&nbsp;'}
{else} {else}
{assign var=OPTION_VALUE value=Vtiger_Util_Helper::toSafeHTML($PICKLIST_NAME)} {assign var=OPTION_VALUE value=Vtiger_Util_Helper::toSafeHTML($PICKLIST_NAME)}
{/if} {/if}
<option value="{$OPTION_VALUE}" {if decode_html($FIELD_MODEL->get('fieldvalue')) eq decode_html($PICKLIST_NAME)} selected {/if}>{$PICKLIST_VALUE}</option> <option value="{$OPTION_VALUE}" {if decode_html($FIELD_MODEL->get('fieldvalue')) eq decode_html($PICKLIST_NAME)} selected {/if}>{$PICKLIST_VALUE}</option>
{/foreach} {/foreach}
</select> </select>
{/strip} {/strip}
\ No newline at end of file
layouts/v7/modules/Vtiger/uitypes/MultiPicklist.tpl
+ 1
− 1
View file @ 6b44dadc
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
********************************************************************************/ ********************************************************************************/
-->*} -->*}
{strip} {strip}
{assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()}
{assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()} {assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
{assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()} {assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
{assign var="FIELD_VALUE_LIST" value=explode(' |##| ',$FIELD_MODEL->get('fieldvalue'))} {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']} {assign var=PICKLIST_COLORS value=$FIELD_INFO['picklistColors']}
<input type="hidden" name="{$FIELD_MODEL->getFieldName()}" value="" data-fieldtype="multipicklist"/> <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;' <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;'
......
layouts/v7/modules/Vtiger/uitypes/MultiSelectFieldSearchView.tpl
+ 3
− 2
View file @ 6b44dadc
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
********************************************************************************/ ********************************************************************************/
-->*} -->*}
{strip} {strip}
{assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())} {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
{assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()} {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'])} {assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
<div class="select2_search_div"> <div class="select2_search_div">
<input type="text" class="listSearchContributor inputElement select2_input_element"/> <input type="text" class="listSearchContributor inputElement select2_input_element"/>
......
layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl
+ 3
− 2
View file @ 6b44dadc
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
********************************************************************************/ ********************************************************************************/
-->*} -->*}
{strip} {strip}
{assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())} {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
{assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()} {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'])} {assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
<div class="select2_search_div"> <div class="select2_search_div">
<input type="text" class="listSearchContributor inputElement select2_input_element"/> <input type="text" class="listSearchContributor inputElement select2_input_element"/>
......
layouts/v7/modules/Vtiger/uitypes/Picklist.tpl
+ 1
− 1
View file @ 6b44dadc
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
{strip} {strip}
{assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()} {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="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
{assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
{assign var=PICKLIST_COLORS value=$FIELD_INFO['picklistColors']} {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')}' <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 $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if}
......
layouts/v7/modules/Vtiger/uitypes/Salutation.tpl
+ 32
− 32
View file @ 6b44dadc
{*<!-- {*+**********************************************************************************
/********************************************************************************* * The contents of this file are subject to the vtiger CRM Public License Version 1.1
** 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
* ("License"); You may not use this file except in compliance with the License * The Original Code is: vtiger CRM Open Source
* The Original Code is: vtiger CRM Open Source * The Initial Developer of the Original Code is vtiger.
* The Initial Developer of the Original Code is vtiger. * Portions created by vtiger are Copyright (C) vtiger.
* Portions created by vtiger are Copyright (C) vtiger. * All Rights Reserved.
* All Rights Reserved. *************************************************************************************}
*
********************************************************************************/
-->*}
{strip} {strip}
{if $SALUTATION_FIELD_MODEL} {if $SALUTATION_FIELD_MODEL}
{assign var=PICKLIST_VALUES value=$SALUTATION_FIELD_MODEL->getPicklistValues()} {assign var=PICKLIST_VALUES value=$SALUTATION_FIELD_MODEL->getPicklistValues()}
{assign var="SALUTATION_VALIDATOR" value=$SALUTATION_FIELD_MODEL->getValidator()} {assign var="SALUTATION_VALIDATOR" value=$SALUTATION_FIELD_MODEL->getValidator()}
<select class="inputElement select2" style="width:78px;" name="{$SALUTATION_FIELD_MODEL->get('name')}" > <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} {if $SALUTATION_FIELD_MODEL->isEmptyPicklistOptionAllowed()}<option value="">{vtranslate('LBL_NONE', $MODULE)}</option>{/if}
{foreach item=PICKLIST_VALUE key=PICKLIST_NAME from=$PICKLIST_VALUES} {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> <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} {/foreach}
</select>&nbsp; </select>&nbsp;
{/if} {/if}
{assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()} {assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
{assign var="FIELD_NAME" value=$FIELD_MODEL->get('name')} {assign var="FIELD_NAME" value=$FIELD_MODEL->get('name')}
{assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()} {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')}" <input id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" type="text" 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} class="inputElement {if $FIELD_MODEL->isNameField()}nameField{/if}"
{if $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if} {if $SALUTATION_FIELD_MODEL} style="width:120px;" {/if}
{if count($FIELD_INFO['validator'])} {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}
data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}' {if $FIELD_INFO["mandatory"] eq true} data-rule-required="true" {/if}
{/if} {if count($FIELD_INFO['validator'])}
/> data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}'
{* TODO - Handler Ticker Symbol field *} {/if}
/>
{* TODO - Handler Ticker Symbol field *}
{/strip} {/strip}
\ No newline at end of file
packages/vtiger/optional/Projects.zip
+ 0
− 0
View file @ 6b44dadc
No preview for this file type
packages/vtiger/optional/Webforms.zip
+ 0
− 0
View file @ 6b44dadc
No preview for this file type
pkg/vtiger/modules/Projects/Project/layouts/v7/modules/Project/SummaryViewWidgets.tpl
+ 9
− 6
View file @ 6b44dadc
...@@ -146,8 +146,9 @@ ...@@ -146,8 +146,9 @@
<div class="pull-left"> <div class="pull-left">
{assign var=RELATED_MODULE_MODEL value=Vtiger_Module_Model::getInstance('HelpDesk')} {assign var=RELATED_MODULE_MODEL value=Vtiger_Module_Model::getInstance('HelpDesk')}
{assign var=FIELD_MODEL value=$RELATED_MODULE_MODEL->getField('ticketstatus')} {assign var=FIELD_MODEL value=$RELATED_MODULE_MODEL->getField('ticketstatus')}
{assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())} {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
{assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()} {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="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} > <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> <option value="">{vtranslate('LBL_SELECT_STATUS',$MODULE_NAME)}</option>
...@@ -211,8 +212,9 @@ ...@@ -211,8 +212,9 @@
<div class="widget_filter clearfix"> <div class="widget_filter clearfix">
{if $PROGRESS_FIELD_MODEL->isViewableInDetailView()} {if $PROGRESS_FIELD_MODEL->isViewableInDetailView()}
<div class="pull-left marginRight15"> <div class="pull-left marginRight15">
{assign var="FIELD_INFO" value=Zend_Json::encode($PROGRESS_FIELD_MODEL->getFieldInfo())} {assign var=FIELD_INFO value=$PROGRESS_FIELD_MODEL->getFieldInfo()}
{assign var=PICKLIST_VALUES value=$PROGRESS_FIELD_MODEL->getPicklistValues()} {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()} {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} > <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> <option value="">{vtranslate('LBL_SELECT_PROGRESS',$MODULE_NAME)}</option>
...@@ -225,8 +227,9 @@ ...@@ -225,8 +227,9 @@
&nbsp;&nbsp; &nbsp;&nbsp;
{if $STATUS_FIELD_MODEL->isViewableInDetailView()} {if $STATUS_FIELD_MODEL->isViewableInDetailView()}
<div class="pull-left marginRight15"> <div class="pull-left marginRight15">
{assign var="FIELD_INFO" value=Zend_Json::encode($STATUS_FIELD_MODEL->getFieldInfo())} {assign var=FIELD_INFO value=$STATUS_FIELD_MODEL->getFieldInfo()}
{assign var=PICKLIST_VALUES value=$STATUS_FIELD_MODEL->getPicklistValues()} {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()} {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} > <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> <option value="">{vtranslate('LBL_SELECT_STATUS',$MODULE_NAME)}</option>
......
pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/ShowForm.tpl
+ 3
− 2
View file @ 6b44dadc
...@@ -38,8 +38,9 @@ ...@@ -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} {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> <td>
{if ($DATA_TYPE eq 'picklist' || $DATA_TYPE eq 'multipicklist')} {if ($DATA_TYPE eq 'picklist' || $DATA_TYPE eq 'multipicklist')}
{assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())} {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
{assign var=PICKLIST_VALUES value=$FIELD_MODEL->getPicklistValues()} {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="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
{assign var=PICKLIST_NAME value=$FIELD_MODEL->get('name')} {assign var=PICKLIST_NAME value=$FIELD_MODEL->get('name')}
{if Settings_Webforms_Record_Model::isCustomField($FIELD_NAME)} {if Settings_Webforms_Record_Model::isCustomField($FIELD_NAME)}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright 2023 Vtiger. All rights reserved.