holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Admin - fix missing/incorrect filter options in user export definition

Browse Source
This commit is contained in:
nathangray 2019-07-10 15:50:31 -06:00
parent d0b5d50b0f
commit 0731731e27
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
admin/inc/class.admin_export_users_csv.inc.php
View File

@ -16,6 +16,22 @@
*/
class admin_export_users_csv implements importexport_iface_export_plugin
{
protected $lookups = array(
'account_status' => array('A' => 'Active', '' => 'Disabled', 'D' => 'Disabled'),
);
public function __construct() {
foreach($this->lookups as $select => &$options)
{
foreach($options as $key => &$label)
{
if(is_string($label))
{
$label = lang($label);
}
}
}
}
/**
* Exports records as defined in $_definition
*
@ -38,10 +54,6 @@ class admin_export_users_csv implements importexport_iface_export_plugin
$export_object = new importexport_export_csv($_stream, (array)$options);
$export_object->set_mapping($options['mapping']);
$lookups = array(
'account_status' => array('A' => lang('Active'), '' => lang('Disabled'), 'D' => lang('Disabled')),
);
// $_record is an array, that's what search() returns
foreach ($selection as $_record)
{
@ -49,7 +61,7 @@ class admin_export_users_csv implements importexport_iface_export_plugin
if($options['convert'])
{
$never_expires = ($record->account_expires == -1);
importexport_export_csv::convert($record, admin_egw_user_record::$types, 'admin', $lookups);
importexport_export_csv::convert($record, admin_egw_user_record::$types, 'admin', $this->lookups);
if($never_expires) $record->account_expires = 'never'; // Has to be 'never' for admin_cmd_edit_user to parse it
}
else
@ -138,4 +150,12 @@ class admin_export_users_csv implements importexport_iface_export_plugin
{
return 'admin_egw_user_record';
}
public function get_filter_fields(&$fields)
{
$fields['account_primary_group']['account_type'] = 'groups';
$fields['account_groups']['account_type'] = 'groups';
$fields['account_status']['values'] = $this->lookups['account_status'];
}
}

4
api/js/etemplate/et2_extension_customfields.js
View File

@ -489,6 +489,10 @@ var et2_customfields_list = (function(){ "use strict"; return et2_valueWidget.ex
},
_setup_select_account: function(field_name, field, attrs) {
attrs.empty_label = egw.lang('Select');
if(field.account_type)
{
attrs.account_type = field.account_type;
}
return this._setup_select(field_name, field, attrs);
},