holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes to ACL dialog based on list filter:

Browse Source 
- If '... run rights to other applications', show current apps with run rights for the account
- For others, restrict application selectbox options to just applications that support ACL
This commit is contained in:
Nathan Gray 2014-04-28 16:19:39 +00:00
parent 21e5eb79dd
commit a8a578962c
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/inc/class.admin_acl.inc.php
View File

@ -469,6 +469,7 @@ class admin_acl
), array(), true),
);
$user = common::grab_owner_name($content['nm']['account_id']);
$content['acl_apps'] = $GLOBALS['egw']->acl->get_app_list_for_id('run', acl::READ, $account_id);
$sel_options = array(
'filter' => array(
'other' => lang('Access to %1 data by others', $user),

16
admin/js/app.js
View File

@ -391,7 +391,21 @@ app.classes.admin = AppJS.extend(
}
if(!content.acl_location)
{
content.acl_location = this.et2.getWidgetById('filter2').getValue() == 'run' ? 'run' : null;
content.acl_location = this.et2.getWidgetById('filter').getValue() == 'run' ? 'run' : null;
}
if(content.acl_location == 'run')
{
// These are the apps the account has access to
content.apps = this.et2.getArrayMgr('content').getEntry('acl_apps')||'';
}
else
{
// Restrict application selectbox to only apps that support ACL
sel_options.acl_appname = {};
for(var app in acl_rights)
{
sel_options.acl_appname[app] = this.egw.lang(app);
}
}
if(!content.acl_account)
{