extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 15:33:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Remove widgets used just to send sel_options

Browse Source 
- Change dialog account_type to both
This commit is contained in:
Nathan Gray 2014-04-23 19:09:28 +00:00
parent 48fa6611f3
commit 85df315cbd
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
admin/js/app.js
View File

@ -400,22 +400,32 @@ app.classes.admin = AppJS.extend(
}
if(content.acl_appname)
{
content.apps = content.acl_appname;
// Load checkboxes & their values
content.acl_rights = content.acl_rights ? parseInt(content.acl_rights) : null;
jQuery.extend(content, {acl:[],right:[],label:[]});
for( var right in acl_rights[content.acl_appname])
{
// only user himself is allowed to grant private (16) rights
if(right == '16' && content['acl_account'] != egw.user('account_id'))
{
// only user himself is allowed to grant private (16) rights
readonlys.acl[content.acl.length] = true;
}
content.acl.push(content.acl_rights & right);
content.right.push(right);
content.label.push(egw.lang(acl_rights[content.acl_appname][right]));
}
}
// Make sure selected values are there
if(content.acl_account)
{
sel_options.acl_account = jQuery.extend({},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 = jQuery.extend({},sel_options.acl_location);
this.egw.link_title('home-accounts', content.acl_location, function(title) {sel_options.acl_location[content.acl_location] = title;});
}
// Create the dialog

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

@ -17,13 +17,13 @@
<row part="header">
<description value="Data from" for="acl_account"/>
<menulist>
<menupopup type="select-account" id="acl_account" needed="1"/>
<menupopup type="select-account" id="acl_account" account_type="both" needed="1"/>
</menulist>
</row>
<row disabled="@acl_location=run" part="header">
<description value="Access by" for="acl_location"/>
<menulist>
<menupopup type="select-account" id="acl_location"/>
<menupopup type="select-account" id="acl_location" account_type="both"/>
</menulist>
</row>
<row valign="top" disabled="@acl_location=run">

8
admin/templates/default/acl.xet
View File

@ -61,14 +61,6 @@
<template id="admin.acl" template="" lang="" group="0" version="1.9.001">
<vbox>
<description id="msg" class="message"/>
<hbox readonly="true">
<menulist>
<menupopup type="select-account" id="acl_account" account_type="both" />
</menulist>
<menulist>
<menupopup type="select-account" id="acl_location" account_type="both"/>
</menulist>
</hbox>
<nextmatch id="nm" template="admin.acl.rows"/>
<hbox class="dialogFooterToolbar">
<button label="Close" id="cancel" onclick="window.close();"/>