extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-24 15:49:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use et2_dialog to edit acls instead of separate popup.

Browse Source
This commit is contained in:
Nathan Gray 2014-04-02 18:32:52 +00:00
parent d5c810d5c4
commit f78cbb5c52
3 changed files with 69 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
admin/js/app.js
View File

@ -324,6 +324,52 @@ app.classes.admin = AppJS.extend(
if (app != 'admin') app = 'preferences';
var className = app+'_acl';
// Select options are already here, just pull them and pass along
var sel_options = jQuery.extend({}, this.et2.getArrayMgr('sel_options').data||{}, {
'apps': this.et2.getArrayMgr('sel_options').getEntry('acl_appname')
});
// For add and edit, set some data from the list since it's already there
var acl_rights = this.et2.getWidgetById('nm').getArrayMgr('content').getEntry('acl_rights')||{};
var content = _senders[0].id ? jQuery.extend({}, egw.dataGetUIDdata(_senders[0].id).data) : {};
if(!content.acl_appname)
{
// Pre-set appname to currently selected
content.acl_appname = this.et2.getWidgetById('filter2').getValue();
}
if(!content.acl_location)
{
content.acl_location = this.et2.getWidgetById('filter2').getValue() == 'run' ? 'run' : null;
}
if(!content.acl_account)
{
content.acl_account = this.et2.getWidgetById('nm').getArrayMgr('content').getEntry('account_id');
}
if(content.acl_appname)
{
content.apps = content.acl_appname;
content.acl_rights = content.acl_rights ? parseInt(acl_rights) : null;
jQuery.extend(content, {acl:[],right:[],label:[]});
for( var right in acl_rights[content.acl_appname])
{
content.acl.push(content.acl_rights & right);
content.right.push(right);
content.label.push(egw.lang(acl_rights[content.acl_appname][right]));
}
// These aren't actually there
if(content.acl_account)
{
sel_options.acl_account = {};
this.egw.link_title('home-accounts', content.acl_account, function(title) {sel_options.acl_account[content.acl_account] = title;});
}
if(content.acl_location)
{
sel_options.acl_location = {};
this.egw.link_title('home-accounts', content.acl_location, function(title) {sel_options.acl_location[content.acl_location] = title;});
}
}
switch(_action.id)
{
case 'delete':
@ -332,20 +378,28 @@ app.classes.admin = AppJS.extend(
break;
case 'edit':
// need to specify window to get correct opener, as admin has multiple windows open!
egw('admin', window).open_link(egw.link('/index.php', {
menuaction: app+'.'+className+'.acl',
id: ids[0]
}), 'acl', '300x300');
break;
case 'add':
var current = ids[0].split(':');
egw('admin', window).open_link(egw.link('/index.php', {
menuaction: app+'.'+className+'.acl',
app: current[0],
account: current[1]
}), 'acl', '250x250');
return et2_createWidget("dialog", {
callback: jQuery.proxy(function(_button_id, _value) {
if(_button_id != et2_dialog.OK_BUTTON) return;
var id = _value.acl_appname+':'+_value.acl_account+':'+_value.acl_location;
var rights = 0;
for(var i in _value.acl)
{
rights += parseInt(_value.acl[i]);
}
this.egw.json(className+'::ajax_change_acl', [id, rights], this._acl_callback,this,false,this)
.sendRequest();
},this),
title: egw.lang('Access control'),
buttons: et2_dialog.BUTTONS_OK_CANCEL,
value: {
content: content,
sel_options: sel_options
},
template: egw.webserverUrl+'/admin/templates/default/acl.edit.xet'
}, et2_dialog._create_parent(app));
break;
}
},

4
admin/templates/default/acl.edit.xet
View File

@ -45,9 +45,5 @@
</row>
</rows>
</grid>
<hbox>
<button label="Save" id="save"/>
<button label="Cancel" id="cancel" onclick="window.close();"/>
</hbox>
</template>
</overlay>

4
admin/templates/default/index.xet
View File

@ -45,7 +45,7 @@
</template>
<template id="admin.index" template="" lang="" group="0" version="1.9.001">
<tree autoloading="admin_ui::ajax_tree" id="tree" onclick="app.admin.run" parent_node="admin_tree_target" std_images="bullet"/>
<nextmatch id="nm" template="admin.index.rows"/>
<iframe frameborder="1" height="100%" id="iframe" scrolling="auto" width="100%" disabled="true"/>
<nextmatch id="nm" template="admin.index.rows" disabled="true"/>
<iframe frameborder="1" height="100%" id="iframe" scrolling="auto" width="100%"/>
</template>
</overlay>