extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

update accounts list and fix "add account" action on tree

Browse Source
This commit is contained in:
Ralf Becker 2014-03-18 18:31:52 +00:00
parent 5347c8d133
commit 08c67c8eed
3 changed files with 53 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/inc/class.admin_account.inc.php
View File

@ -129,6 +129,8 @@ class admin_account
$cmd = new admin_cmd_edit_user((int)$content['account_id'], $account);
$cmd->run();
egw_json_response::get()->call('egw.refresh', '', 'admin', $cmd->account, $content['account_id'] ? 'edit' : 'add');
// for a new account a new contact was created, need to merge that data with $content
if (!$content['account_id'])
{

13
admin/inc/class.admin_ui.inc.php
View File

@ -91,11 +91,7 @@ class admin_ui
'enableId' => '^/groups/-\\d+',
'icon' => 'lock',
),
'add' => array(
'caption' => 'Add user',
'url' => egw::link('/index.php?menuaction=admin.uiaccounts.edit_user'),
'onExecute' => 'javaScript:app.admin.iframe_location',
),
'add' => $content['nm']['actions']['add'],
'delete' => array(
'onExecute' => 'javaScript:app.admin.group',
'confirm' => 'Delete this group',
@ -133,16 +129,13 @@ class admin_ui
'caption' => 'Open',
'default' => true,
'allowOnMultiple' => false,
'popup' => egw_link::is_popup('addressbook', 'edit'),
'url' => '',
'onExecute' => 'javaScript:app.admin.account',
'group' => $group=0,
),
'add' => array(
'caption' => 'Add user',
'url' => 'menuaction=admin.uiaccounts.edit_user',
'onExecute' => 'javaScript:app.admin.account',
'group' => $group,
'popup' => egw_link::is_popup('addressbook', 'add'),
'url' => '',
),
'acl' => array(
'caption' => 'Access control',

54
admin/js/app.js
View File

@ -103,21 +103,40 @@ app.classes.admin = AppJS.extend(
*/
refresh: function(_msg, _app, _id, _type)
{
var refresh_done = false;
// Try for intelligent et2 refresh inside iframe
var node = null;
if(_app && _id && this.iframe != null &&
(node = this.iframe.getDOMNode(this.iframe)) &&
node && node.contentWindow && node.contentWindow.etemplate2)
var node = _app && _id && this.iframe ? this.iframe.getDOMNode(this.iframe) : null;
if(node && node.contentWindow && node.contentWindow.etemplate2)
{
var templates = node.contentWindow.etemplate2.getByApplication('admin');
for(var i = 0; i < templates.length; i++)
{
templates[i].refresh(_msg,_app,_id,_type);
refresh_done = true;
}
}
else
// update of account list eg. from addressbook.edit
if(!refresh_done && _app == 'admin' && _id)
{
this.linkHandler(window.framework.getApplicationByName(_app).browser.currentLocation);
var templates = etemplate2.getByApplication('admin');
for(var i = 0; i < templates.length; i++)
{
templates[i].refresh(_msg,_app,_id,_type);
refresh_done = true;
}
}
// update iframe
if (!refresh_done && framework)
{
var app = framework.getApplicationByName(_app);
if (app && app.browser && app.browser.currentLocation)
{
this.linkHandler(app.browser.currentLocation);
}
}
},
@ -378,5 +397,28 @@ app.classes.admin = AppJS.extend(
{
img.set_src(widget.getValue());
}
},
/**
* Add / edit an account
*
* @param {object} _action egwAction
* @param {array} _senders egwActionObject _senders[0].id holds account_id
*/
account: function(_action, _senders)
{
var params = jQuery.extend({}, this.egw.link_get_registry('addressbook', 'edit'));
var popup = this.egw.link_get_registry('addressbook', 'edit_popup');
if (_action.id == 'add')
{
params.owner = '0';
}
else
{
params.account_id = _senders[0].id.substr(7); // remove admin::
}
this.egw.open_link(this.egw.link('/index.php', params), 'admin', popup);
}
});