Fixes #1243 Owner and Ownergroup fields should fetch data from fieldInfo

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)}

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)}

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}

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')}

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)}