mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-28 13:51:44 +02:00
fixed not working preferences tab in manage users
This commit is contained in:
parent
dc68edab46
commit
c4d3c38c24
@ -28,9 +28,30 @@
|
|||||||
{
|
{
|
||||||
/* Don't use a global variable for this ... */
|
/* Don't use a global variable for this ... */
|
||||||
define('HAS_ADMIN_RIGHTS',1);
|
define('HAS_ADMIN_RIGHTS',1);
|
||||||
|
|
||||||
|
if ((int) $_GET['account_id'])
|
||||||
|
{
|
||||||
|
$GLOBALS['egw']->preferences->account_id = (int) $_GET['account_id'];
|
||||||
|
$GLOBALS['egw']->preferences->read_repository();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* add nation ACL tab to Admin >> Edit user
|
||||||
|
*/
|
||||||
|
function edit_user()
|
||||||
|
{
|
||||||
|
global $menuData;
|
||||||
|
|
||||||
|
$menuData[] = array(
|
||||||
|
'description' => 'Preferences',
|
||||||
|
'url' => '/index.php',
|
||||||
|
'extradata' => 'menuaction=preferences.uisettings.index&appname=preferences'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function index()
|
function index()
|
||||||
{
|
{
|
||||||
// make preferences called via sidebox menu of an app, to behave like a part of that app
|
// make preferences called via sidebox menu of an app, to behave like a part of that app
|
||||||
@ -62,6 +83,10 @@
|
|||||||
'menuaction' => 'preferences.uisettings.index',
|
'menuaction' => 'preferences.uisettings.index',
|
||||||
'appname' => $_GET['appname'],
|
'appname' => $_GET['appname'],
|
||||||
);
|
);
|
||||||
|
if ($this->is_admin() && (int) $_GET['account_id'])
|
||||||
|
{
|
||||||
|
$link_params['account_id'] = (int) $_GET['account_id'];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$user = get_var('user',Array('POST'));
|
$user = get_var('user',Array('POST'));
|
||||||
$forced = get_var('forced',Array('POST'));
|
$forced = get_var('forced',Array('POST'));
|
||||||
@ -259,8 +284,9 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$GLOBALS['egw_info']['flags']['app_header'] = $_GET['appname'] == 'preferences' ?
|
$GLOBALS['egw_info']['flags']['app_header'] = ($this->is_admin() && (int) $_GET['account_id'] ?
|
||||||
lang('Preferences') : lang('%1 - Preferences',$GLOBALS['egw_info']['apps'][$_GET['appname']]['title']);
|
$GLOBALS['egw']->common->grab_owner_name((int) $_GET['account_id']).': ' : '').($_GET['appname'] == 'preferences' ?
|
||||||
|
lang('Common preferences') : lang('%1 - Preferences',$GLOBALS['egw_info']['apps'][$_GET['appname']]['title']));
|
||||||
$GLOBALS['egw']->common->egw_header();
|
$GLOBALS['egw']->common->egw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
|
|
||||||
@ -271,8 +297,14 @@
|
|||||||
}
|
}
|
||||||
if($this->is_admin())
|
if($this->is_admin())
|
||||||
{
|
{
|
||||||
|
if ((int) $_GET['account_id'])
|
||||||
|
{
|
||||||
|
echo '<table><tr valign="top"><td>'."\n".ExecMethod('admin.uimenuclass.createHTMLCode','edit_user')."\n</td>\n<td>".
|
||||||
|
'<p class="th" style="width: 100%; text-align: left; font-weight: bold; margin-top: 2px; padding: 1px;">'.
|
||||||
|
lang('Common preferences')."</p>\n";
|
||||||
|
}
|
||||||
$tabs[] = array(
|
$tabs[] = array(
|
||||||
'label' => lang('Your preferences'),
|
'label' => (int) $_GET['account_id'] ? $GLOBALS['egw']->common->grab_owner_name($_GET['account_id']) : lang('Your preferences'),
|
||||||
'link' => $GLOBALS['egw']->link($pref_link,$link_params+array('type'=>'user')),
|
'link' => $GLOBALS['egw']->link($pref_link,$link_params+array('type'=>'user')),
|
||||||
);
|
);
|
||||||
$tabs[] = array(
|
$tabs[] = array(
|
||||||
@ -305,6 +337,10 @@
|
|||||||
}
|
}
|
||||||
$this->t->pfp('phpgw_body','preferences');
|
$this->t->pfp('phpgw_body','preferences');
|
||||||
|
|
||||||
|
if($this->is_admin() && (int) $_GET['account_id'])
|
||||||
|
{
|
||||||
|
echo "\n</td></tr></table>\n";
|
||||||
|
}
|
||||||
//echo '<pre style="text-align: left;">'; print_r($GLOBALS['egw']->preferences->data); echo "</pre>\n";
|
//echo '<pre style="text-align: left;">'; print_r($GLOBALS['egw']->preferences->data); echo "</pre>\n";
|
||||||
|
|
||||||
$GLOBALS['egw']->common->egw_footer();
|
$GLOBALS['egw']->common->egw_footer();
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
$setup_info['preferences']['hooks'][] = 'config';
|
$setup_info['preferences']['hooks'][] = 'config';
|
||||||
$setup_info['preferences']['hooks'][] = 'preferences';
|
$setup_info['preferences']['hooks'][] = 'preferences';
|
||||||
$setup_info['preferences']['hooks'][] = 'settings';
|
$setup_info['preferences']['hooks'][] = 'settings';
|
||||||
|
$setup_info['preferences']['hooks']['edit_user'] = 'preferences.uisettings.edit_user';
|
||||||
|
|
||||||
/* Dependencies for this app to work */
|
/* Dependencies for this app to work */
|
||||||
$setup_info['preferences']['depends'][] = array(
|
$setup_info['preferences']['depends'][] = array(
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
<br>
|
|
||||||
<center><b>{messages}</b></center>
|
<center><b>{messages}</b></center>
|
||||||
|
|
||||||
<!-- BEGIN form -->
|
<!-- BEGIN form -->
|
||||||
|
Loading…
x
Reference in New Issue
Block a user