If user is admin, show the admin Import/Export sidebox with the definition list

r41000: Default application filter to the application you were just in
This commit is contained in:
Nathan Gray 2012-12-04 22:50:05 +00:00
parent a0965bfd9f
commit dfed845b72
2 changed files with 4 additions and 2 deletions

View File

@ -54,7 +54,7 @@ class importexport_admin_prefs_sidebox_hooks
{
$file['Define imports|exports'] = egw::link('/index.php',array(
'menuaction' => 'importexport.importexport_definitions_ui.index',
),'preferences');
),$GLOBALS['egw_info']['user']['apps']['admin'] ? 'admin' : 'preferences');
}
if ($location == 'preferences')
{
@ -207,7 +207,8 @@ this.value = \'\'"';
{
$file['Define imports|exports'] = egw::link('/index.php',array(
'menuaction' => 'importexport.importexport_definitions_ui.index',
), 'preferences');
'application' => $appname,
),$GLOBALS['egw_info']['user']['apps']['admin'] ? 'admin' : 'preferences');
}
if($file) display_sidebox($appname,lang('importexport'),$file);
}

View File

@ -161,6 +161,7 @@ class importexport_definitions_ui
'default_cols' => '!actions', // switch legacy actions column and row off by default
'row_id' => 'definition_id',
);
if($_GET['application']) $content['nm']['col_filter']['application'] = $_GET['application'];
}
if(egw_session::appsession('index', 'importexport')) {
$content['nm'] = array_merge($content['nm'], egw_session::appsession('index', 'importexport'));