extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Import user - Remove conditions on account_id, backends don't support search by it

Browse Source
This commit is contained in:
nathangray 2019-05-21 10:41:50 -06:00
parent 533c9c0351
commit 0c9ef3811e
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/inc/class.admin_import_users_csv.inc.php
View File

@ -204,7 +204,7 @@ class admin_import_users_csv implements importexport_iface_import_plugin {
case 'create' : case 'create' :
case 'update' : case 'update' :
$command = new admin_cmd_edit_user(array( $command = new admin_cmd_edit_user(array(
'account' => $_action=='create'?null:(int)$_data['account_lid'], 'account' => $_action=='create'?null:(int)$_data['account_id'],
'set' => $_data 'set' => $_data
)+(array)$admin_cmd); )+(array)$admin_cmd);

15
admin/inc/class.admin_wizard_import_users_csv.inc.php
View File

@ -59,8 +59,19 @@ class admin_wizard_import_users_csv extends importexport_wizard_basic_import_csv
function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv) function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
{ {
$result = parent::wizard_step50($content, $sel_options, $readonlys, $preserv); $result = parent::wizard_step50($content, $sel_options, $readonlys, $preserv);
$content['msg'] .= "\n*" ;
return $result;
}
/**
* Edit conditions - remove account_id as condition option
*/
function wizard_step55(&$content, &$sel_options, &$readonlys, &$preserv)
{
$result = parent::wizard_step55($content, $sel_options, $readonlys, $preserv);
unset($sel_options['string']['account_id']);
return $result; return $result;
} }
} }