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

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

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

@ -160,7 +160,6 @@ class importexport_definitions_ui
} }
} }
if(!is_array($content['nm'])) {
$content['nm'] = array( $content['nm'] = array(
'get_rows' => 'importexport.importexport_definitions_ui.get_rows', 'get_rows' => 'importexport.importexport_definitions_ui.get_rows',
'no_cat' => true, 'no_cat' => true,
@ -172,7 +171,7 @@ class importexport_definitions_ui
'placeholder_actions' => array('add') 'placeholder_actions' => array('add')
); );
if($_GET['application']) $content['nm']['col_filter']['application'] = $_GET['application']; if($_GET['application']) $content['nm']['col_filter']['application'] = $_GET['application'];
}
if(Api\Cache::getSession('importexport', 'index')) if(Api\Cache::getSession('importexport', 'index'))
{ {
$content['nm'] = array_merge($content['nm'], 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) { public function get_rows(&$query, &$rows, &$readonlys) {
$rows = array(); $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' // Special handling for allowed users 'private'
if($query['col_filter']['allowed_users'] == 'private') if($query['col_filter']['allowed_users'] == 'private')