extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 09:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add a column for run rights, each of which gets their own row

Browse Source
This commit is contained in:
nathangray 2017-11-02 10:24:47 -06:00
parent 069d49afba
commit 42ca76e824
4 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ class admin_egw_acl_record implements importexport_iface_egw_record
static $types = array( static $types = array(
'select' => array('acl_appname'), 'select' => array('acl_appname'),
'select-account' => array('acl_account', 'acl_location'), 'select-account' => array('acl_account', 'acl_location'),
'select-bool' => array('acl1', 'acl2','acl4','acl8','acl16','acl64','acl128','acl256'), 'select-bool' => array('acl_run', 'acl1', 'acl2','acl4','acl8','acl16','acl64','acl128','acl256'),
); );
/** /**

37
admin/inc/class.admin_export_acl_csv.inc.php
View File

@ -56,10 +56,7 @@ class admin_export_acl_csv implements importexport_iface_export_plugin
} }
foreach($accounts as $account_id => $account_data) foreach($accounts as $account_id => $account_data)
{ {
$query['account_id'] = $account_id; $this->get_account_acl($account_id, $options['mapping']['acl_run'], $query, $selection);
$account_acl = array();
admin_acl::get_rows($query, $account_acl);
$selection = array_merge($selection, $account_acl);
} }
$options['begin_with_fieldnames'] = true; $options['begin_with_fieldnames'] = true;
@ -110,6 +107,38 @@ class admin_export_acl_csv implements importexport_iface_export_plugin
return $export_object; return $export_object;
} }
/**
* Get the acl data for one account & format it as needed
*
* @param int $account_id
* @param boolean $run_rights Include run rights
* @param array $query
* @param array $selection
*/
protected function get_account_acl($account_id, $run_rights, $query, &$selection)
{
$query['account_id'] = $account_id;
$query['filter'] = 'other';
$account_acl = array();
admin_acl::get_rows($query, $account_acl);
$selection = array_merge($selection, $account_acl);
$run = array();
if($run_rights)
{
$query['filter'] = 'run';
admin_acl::get_rows($query, $run);
foreach($run as &$run_row)
{
$run_row['acl_run'] = true;
unset($run_row['acl_location']);
unset($run_row['acl1']);
}
$selection = array_merge($selection, $run);
}
}
/** /**
* returns translated name of plugin * returns translated name of plugin
* *

1
admin/inc/class.admin_wizard_export_acl_csv.inc.php
View File

@ -23,6 +23,7 @@ class admin_wizard_export_acl_csv extends importexport_wizard_basic_export_csv
'acl_appname' => lang('Application'), 'acl_appname' => lang('Application'),
'acl_location' => lang('Data from'), 'acl_location' => lang('Data from'),
'all_acls' => lang('All ACLs'), 'all_acls' => lang('All ACLs'),
'acl_run' => lang('Run'),
'acl1' => lang('Read'), 'acl1' => lang('Read'),
'acl2' => lang('Add'), 'acl2' => lang('Add'),
'acl4' => lang('Edit'), 'acl4' => lang('Edit'),

1
admin/setup/importexport_default.xml
View File

@ -17,6 +17,7 @@
<entry type="string" name="acl_account">acl_account</entry> <entry type="string" name="acl_account">acl_account</entry>
<entry type="string" name="acl_appname">acl_appname</entry> <entry type="string" name="acl_appname">acl_appname</entry>
<entry type="string" name="acl_location">acl_location</entry> <entry type="string" name="acl_location">acl_location</entry>
<entry type="string" name="acl1">acl_run</entry>
<entry type="string" name="acl1">acl1</entry> <entry type="string" name="acl1">acl1</entry>
<entry type="string" name="acl2">acl2</entry> <entry type="string" name="acl2">acl2</entry>
<entry type="string" name="acl4">acl4</entry> <entry type="string" name="acl4">acl4</entry>