From dfed845b728a8435752776cd29580f49b8cbb32d Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 4 Dec 2012 22:50:05 +0000 Subject: [PATCH] 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 --- .../inc/class.importexport_admin_prefs_sidebox_hooks.inc.php | 5 +++-- importexport/inc/class.importexport_definitions_ui.inc.php | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php b/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php index dddd11edad..f1ed0a2f33 100644 --- a/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php +++ b/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php @@ -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); } diff --git a/importexport/inc/class.importexport_definitions_ui.inc.php b/importexport/inc/class.importexport_definitions_ui.inc.php index 7e4dcbc90d..691ac50e65 100644 --- a/importexport/inc/class.importexport_definitions_ui.inc.php +++ b/importexport/inc/class.importexport_definitions_ui.inc.php @@ -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'));