Skip to content
Snippets Groups Projects
Commit fcc833eb authored by Prasad's avatar Prasad
Browse files

Fixes #630: Disable auto-selection of owner field in massedit form

parent 0a86da9e
No related branches found
No related tags found
No related merge requests found
...@@ -31,9 +31,10 @@ ...@@ -31,9 +31,10 @@
data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}' data-specific-rules='{ZEND_JSON::encode($FIELD_INFO["validator"])}'
{/if} {/if}
> >
{if $FIELD_MODEL->isCustomField() || $VIEW_SOURCE eq 'MASSEDIT'} <option value="">{vtranslate('LBL_SELECT_OPTION','Vtiger')}</option> {/if}
<optgroup label="{vtranslate('LBL_USERS')}"> <optgroup label="{vtranslate('LBL_USERS')}">
{foreach key=OWNER_ID item=OWNER_NAME from=$ALL_ACTIVEUSER_LIST} {foreach key=OWNER_ID item=OWNER_NAME from=$ALL_ACTIVEUSER_LIST}
<option value="{$OWNER_ID}" data-picklistvalue= '{$OWNER_NAME}' {if $FIELD_VALUE eq $OWNER_ID} selected {/if} <option value="{$OWNER_ID}" data-picklistvalue= '{$OWNER_NAME}' {if $FIELD_VALUE eq $OWNER_ID && $VIEW_SOURCE neq 'MASSEDIT'} selected {/if}
{if array_key_exists($OWNER_ID, $ACCESSIBLE_USER_LIST)} data-recordaccess=true {else} data-recordaccess=false {/if} {if array_key_exists($OWNER_ID, $ACCESSIBLE_USER_LIST)} data-recordaccess=true {else} data-recordaccess=false {/if}
data-userId="{$CURRENT_USER_ID}"> data-userId="{$CURRENT_USER_ID}">
{$OWNER_NAME} {$OWNER_NAME}
... ...
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
{/if}> {/if}>
<option value="">{vtranslate('LBL_SELECT_OPTION','Vtiger')}</option> <option value="">{vtranslate('LBL_SELECT_OPTION','Vtiger')}</option>
{foreach key=OWNER_ID item=OWNER_NAME from=$ALL_ACTIVEGROUP_LIST} {foreach key=OWNER_ID item=OWNER_NAME from=$ALL_ACTIVEGROUP_LIST}
<option value="{$OWNER_ID}" data-picklistvalue='{$OWNER_NAME}' {if $FIELD_MODEL->get('fieldvalue') eq $OWNER_ID} selected {/if} <option value="{$OWNER_ID}" data-picklistvalue='{$OWNER_NAME}' {if $VIEW_SOURCE neq 'MASSEDIT' && $FIELD_MODEL->get('fieldvalue') eq $OWNER_ID} selected {/if}
{if array_key_exists($OWNER_ID, $ACCESSIBLE_GROUP_LIST)} data-recordaccess=true {else} data-recordaccess=false {/if} > {if array_key_exists($OWNER_ID, $ACCESSIBLE_GROUP_LIST)} data-recordaccess=true {else} data-recordaccess=false {/if} >
{$OWNER_NAME} {$OWNER_NAME}
</option> </option>
... ...
......
...@@ -68,6 +68,7 @@ class Vtiger_MassActionAjax_View extends Vtiger_IndexAjax_View { ...@@ -68,6 +68,7 @@ class Vtiger_MassActionAjax_View extends Vtiger_IndexAjax_View {
$viewer->assign('CVID', $cvId); $viewer->assign('CVID', $cvId);
$viewer->assign('SELECTED_IDS', $selectedIds); $viewer->assign('SELECTED_IDS', $selectedIds);
$viewer->assign('EXCLUDED_IDS', $excludedIds); $viewer->assign('EXCLUDED_IDS', $excludedIds);
$viewer->assign('VIEW_SOURCE','MASSEDIT');
$viewer->assign('RECORD_STRUCTURE_MODEL', $recordStructureInstance); $viewer->assign('RECORD_STRUCTURE_MODEL', $recordStructureInstance);
$viewer->assign('MODULE_MODEL',$moduleModel); $viewer->assign('MODULE_MODEL',$moduleModel);
$viewer->assign('MASS_EDIT_FIELD_DETAILS',$fieldInfo); $viewer->assign('MASS_EDIT_FIELD_DETAILS',$fieldInfo);
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment