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

Import/Export - fix definition list actions (Create export) disappeared from context menu after use

Browse Source
This commit is contained in:
nathangray 2019-07-08 13:28:59 -06:00
parent b6bbe8c681
commit 94798bb691
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
importexport/inc/class.importexport_definitions_ui.inc.php
View File

@ -160,19 +160,18 @@ class importexport_definitions_ui
}
}
if(!is_array($content['nm'])) {
$content['nm'] = array(
'get_rows' => 'importexport.importexport_definitions_ui.get_rows',
'no_cat' => true,
'no_filter' => true,
'no_filter2' => true,
'csv_fields' => false, // Disable CSV export, uses own export
'default_cols' => '!actions', // switch legacy actions column and row off by default
'row_id' => 'definition_id',
'placeholder_actions' => array('add')
);
if($_GET['application']) $content['nm']['col_filter']['application'] = $_GET['application'];
}
$content['nm'] = array(
'get_rows' => 'importexport.importexport_definitions_ui.get_rows',
'no_cat' => true,
'no_filter' => true,
'no_filter2' => true,
'csv_fields' => false, // Disable CSV export, uses own export
'default_cols' => '!actions', // switch legacy actions column and row off by default
'row_id' => 'definition_id',
'placeholder_actions' => array('add')
);
if($_GET['application']) $content['nm']['col_filter']['application'] = $_GET['application'];
if(Api\Cache::getSession('importexport', 'index'))
{
$content['nm'] = array_merge($content['nm'], Api\Cache::getSession('importexport', 'index'));
@ -427,7 +426,9 @@ class importexport_definitions_ui
public function get_rows(&$query, &$rows, &$readonlys) {
$rows = array();
Api\Cache::setSession('importexport', 'index', $query);
Api\Cache::setSession('importexport', 'index', array_intersect_key($query, array_flip(array(
'col_filter', 'search', 'filter', 'filter2'
))));
// Special handling for allowed users 'private'
if($query['col_filter']['allowed_users'] == 'private')