From 3779d49cca7ea684c24717bff6ef980cbaf75996 Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Sat, 21 Mar 2020 15:26:58 +0530
Subject: [PATCH] Fixes #1243 Owner and Ownergroup fields should fetch data
from fieldInfo
---
.../modules/Calendar/uitypes/OwnerFieldTaskSearchView.tpl | 5 +++--
layouts/v7/modules/Vtiger/uitypes/Owner.tpl | 6 +++---
.../v7/modules/Vtiger/uitypes/OwnerFieldSearchView.tpl | 8 ++++----
layouts/v7/modules/Vtiger/uitypes/OwnerGroup.tpl | 2 +-
.../modules/Vtiger/uitypes/OwnerGroupFieldSearchView.tpl | 3 ++-
5 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/layouts/v7/modules/Calendar/uitypes/OwnerFieldTaskSearchView.tpl b/layouts/v7/modules/Calendar/uitypes/OwnerFieldTaskSearchView.tpl
index 9176b0b16..f5f44a78b 100644
--- a/layouts/v7/modules/Calendar/uitypes/OwnerFieldTaskSearchView.tpl
+++ b/layouts/v7/modules/Calendar/uitypes/OwnerFieldTaskSearchView.tpl
@@ -12,14 +12,15 @@
{strip}
<div class="">
{assign var=ASSIGNED_USER_ID value=$FIELD_MODEL->get('name')}
- {assign var=ALL_ACTIVEUSER_LIST value=$USER_MODEL->getAccessibleUsers()}
+ {assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
+ {assign var=ALL_ACTIVEUSER_LIST value=$FIELD_INFO['picklistvalues'][vtranslate('LBL_USERS')]}
{assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
{assign var=SEARCH_VALUES value=array_map("trim",$SEARCH_VALUES)}
{if $FIELD_MODEL->get('uitype') eq '52' || $FIELD_MODEL->get('uitype') eq '77'}
{assign var=ALL_ACTIVEGROUP_LIST value=array()}
{else}
- {assign var=ALL_ACTIVEGROUP_LIST value=$USER_MODEL->getAccessibleGroups()}
+ {assign var=ALL_ACTIVEGROUP_LIST value=$FIELD_INFO['picklistvalues'][vtranslate('LBL_GROUPS')]}
{/if}
{assign var=ACCESSIBLE_USER_LIST value=$USER_MODEL->getAccessibleUsersForModule($MODULE)}
diff --git a/layouts/v7/modules/Vtiger/uitypes/Owner.tpl b/layouts/v7/modules/Vtiger/uitypes/Owner.tpl
index 2b3905b9b..2af89d6b8 100644
--- a/layouts/v7/modules/Vtiger/uitypes/Owner.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/Owner.tpl
@@ -13,10 +13,10 @@
{assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
{assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
{if $FIELD_MODEL->get('uitype') eq '53'}
- {assign var=ALL_ACTIVEUSER_LIST value=$USER_MODEL->getAccessibleUsers()}
- {assign var=ALL_ACTIVEGROUP_LIST value=$USER_MODEL->getAccessibleGroups()}
+ {assign var=ALL_ACTIVEUSER_LIST value=$FIELD_INFO['picklistvalues'][vtranslate('LBL_USERS')]}
+ {assign var=ALL_ACTIVEGROUP_LIST value=$FIELD_INFO['picklistvalues'][vtranslate('LBL_GROUPS')]}
{assign var=ASSIGNED_USER_ID value=$FIELD_MODEL->get('name')}
- {assign var=CURRENT_USER_ID value=$USER_MODEL->get('id')}
+ {assign var=CURRENT_USER_ID value=$USER_MODEL->get('id')}
{assign var=FIELD_VALUE value=$FIELD_MODEL->get('fieldvalue')}
{assign var=ACCESSIBLE_USER_LIST value=$USER_MODEL->getAccessibleUsersForModule($MODULE)}
diff --git a/layouts/v7/modules/Vtiger/uitypes/OwnerFieldSearchView.tpl b/layouts/v7/modules/Vtiger/uitypes/OwnerFieldSearchView.tpl
index 9b01991cc..4fdd538d5 100644
--- a/layouts/v7/modules/Vtiger/uitypes/OwnerFieldSearchView.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/OwnerFieldSearchView.tpl
@@ -10,24 +10,24 @@
********************************************************************************/
-->*}
{strip}
- {assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
+ {assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
<div class="select2_search_div">
{assign var=ASSIGNED_USER_ID value=$FIELD_MODEL->get('name')}
- {assign var=ALL_ACTIVEUSER_LIST value=$USER_MODEL->getAccessibleUsers()}
+ {assign var=ALL_ACTIVEUSER_LIST value=$FIELD_INFO['picklistvalues'][vtranslate('LBL_USERS')]}
{assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
{assign var=SEARCH_VALUES value=array_map("trim",$SEARCH_VALUES)}
{if $FIELD_MODEL->get('uitype') eq '52' || $FIELD_MODEL->get('uitype') eq '77'}
{assign var=ALL_ACTIVEGROUP_LIST value=array()}
{else}
- {assign var=ALL_ACTIVEGROUP_LIST value=$USER_MODEL->getAccessibleGroups()}
+ {assign var=ALL_ACTIVEGROUP_LIST value=$FIELD_INFO['picklistvalues'][vtranslate('LBL_GROUPS')]}
{/if}
{assign var=ACCESSIBLE_USER_LIST value=$USER_MODEL->getAccessibleUsersForModule($MODULE)}
{assign var=ACCESSIBLE_GROUP_LIST value=$USER_MODEL->getAccessibleGroupForModule($MODULE)}
<input type="text" class="listSearchContributor inputElement select2_input_element"/>
- <select class="select2 listSearchContributor {$ASSIGNED_USER_ID}" name="{$ASSIGNED_USER_ID}" multiple data-fieldinfo='{$FIELD_INFO|escape}' style="display:none">
+ <select class="select2 listSearchContributor {$ASSIGNED_USER_ID}" name="{$ASSIGNED_USER_ID}" multiple data-fieldinfo='{Zend_Json::encode($FIELD_INFO)|escape}' style="display:none">
<optgroup label="{vtranslate('LBL_USERS')}">
{foreach key=OWNER_ID item=OWNER_NAME from=$ALL_ACTIVEUSER_LIST}
<option value="{$OWNER_NAME}" data-picklistvalue= '{$OWNER_NAME}' {if in_array(trim(decode_html($OWNER_NAME)),$SEARCH_VALUES)} selected {/if}
diff --git a/layouts/v7/modules/Vtiger/uitypes/OwnerGroup.tpl b/layouts/v7/modules/Vtiger/uitypes/OwnerGroup.tpl
index 7584b5402..7968de1c9 100644
--- a/layouts/v7/modules/Vtiger/uitypes/OwnerGroup.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/OwnerGroup.tpl
@@ -10,7 +10,7 @@
{strip}
{assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
{assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
- {assign var=ALL_ACTIVEGROUP_LIST value=$USER_MODEL->getAccessibleGroups()}
+ {assign var=ALL_ACTIVEGROUP_LIST value=$FIELD_INFO['picklistvalues'][vtranslate('LBL_GROUPS')]}
{assign var=ASSIGNED_GROUP_ID value=$FIELD_MODEL->get('name')}
{assign var=CURRENT_USER_ID value=$USER_MODEL->get('id')}
{assign var=FIELD_VALUE value=$FIELD_MODEL->get('fieldvalue')}
diff --git a/layouts/v7/modules/Vtiger/uitypes/OwnerGroupFieldSearchView.tpl b/layouts/v7/modules/Vtiger/uitypes/OwnerGroupFieldSearchView.tpl
index 0daeaafb8..51edb7f9e 100644
--- a/layouts/v7/modules/Vtiger/uitypes/OwnerGroupFieldSearchView.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/OwnerGroupFieldSearchView.tpl
@@ -8,6 +8,7 @@
*************************************************************************************}
{strip}
+ {assign var="FIELD_INFO" value=$FIELD_MODEL->getFieldInfo()}
{assign var=ASSIGNED_USER_ID value=$FIELD_MODEL->get('name')}
{assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
{assign var=SEARCH_VALUES value=array_map("trim",$SEARCH_VALUES)}
@@ -15,7 +16,7 @@
{if $FIELD_MODEL->get('uitype') eq '52' || $FIELD_MODEL->get('uitype') eq '77'}
{assign var=ALL_ACTIVEGROUP_LIST value=array()}
{else}
- {assign var=ALL_ACTIVEGROUP_LIST value=$USER_MODEL->getAccessibleGroups()}
+ {assign var=ALL_ACTIVEGROUP_LIST value=$FIELD_INFO['picklistvalues'][vtranslate('LBL_GROUPS')]}
{/if}
{assign var=ACCESSIBLE_GROUP_LIST value=$USER_MODEL->getAccessibleGroupForModule($MODULE)}
--
GitLab