extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-02 19:39:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

preserve ACL Edit Active State on FolderChange

Browse Source
This commit is contained in:
Klaus Leithoff 2012-12-07 15:01:25 +00:00
parent cb3e3d176b
commit 67425171f5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
felamimail/inc/class.ajaxfelamimail.inc.php
View File

@ -223,7 +223,7 @@ class ajaxfelamimail
*/ */
function createACLTable($_acl) function createACLTable($_acl)
{ {
if($this->_debug) error_log(__METHOD__.__LINE__.array2string($_acl)); if($this->_debug) error_log(__METHOD__.__LINE__.array2string($_acl).function_backtrace());
$aclList = array('l','r','s','w','i','p','c','d','a'); $aclList = array('l','r','s','w','i','p','c','d','a');
$lang["lang_acl_l"] = "Look up the name of the mailbox (but not its contents)."; $lang["lang_acl_l"] = "Look up the name of the mailbox (but not its contents).";
@ -873,6 +873,7 @@ class ajaxfelamimail
$aclSupported = in_array('ACL',$this->bofelamimail->icServer->_serverSupportedCapabilities); $aclSupported = in_array('ACL',$this->bofelamimail->icServer->_serverSupportedCapabilities);
if($aclSupported && ($folderACL = $this->bofelamimail->getIMAPACL($folderName))) { if($aclSupported && ($folderACL = $this->bofelamimail->getIMAPACL($folderName))) {
$response->addAssign("aclTable", "innerHTML", $this->createACLTable($folderACL)); $response->addAssign("aclTable", "innerHTML", $this->createACLTable($folderACL));
$response->addScript("updateACLView('useCurrentActiveState');");
} }
else else
{ {
@ -896,6 +897,7 @@ class ajaxfelamimail
if($folderName != '--topfolder--' && $folderName != 'user' && ($folderACL = $this->bofelamimail->getIMAPACL($folderName))) { if($folderName != '--topfolder--' && $folderName != 'user' && ($folderACL = $this->bofelamimail->getIMAPACL($folderName))) {
$aclSupported = in_array('ACL',$this->bofelamimail->icServer->_serverSupportedCapabilities); $aclSupported = in_array('ACL',$this->bofelamimail->icServer->_serverSupportedCapabilities);
$response->addAssign("aclTable", "innerHTML", ($aclSupported?$this->createACLTable($folderACL):'')); $response->addAssign("aclTable", "innerHTML", ($aclSupported?$this->createACLTable($folderACL):''));
$response->addScript("updateACLView('useCurrentActiveState');");
} }
else else
{ {

6
felamimail/js/jscode/listFolder.js
View File

@ -25,6 +25,7 @@ function disableACLEdit()
var active = document.getElementById('active'); var active = document.getElementById('active');
active.checked = false; active.checked = false;
active.disabled = true; active.disabled = true;
updateACLView('disableACL');
} }
function updateACLView(activateACL) function updateACLView(activateACL)
@ -33,7 +34,10 @@ function updateACLView(activateACL)
var active = document.getElementById('active'); var active = document.getElementById('active');
if (activateACL=='disableACL') active.checked = false; if (activateACL=='disableACL') active.checked = false;
else active.checked = false; else
{
if (activateACL!='useCurrentActiveState') active.checked = false;
}
onchange_active(active); onchange_active(active);
} }