mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 05:15:45 +00:00
rest of fix for 13560, don't display permissions on imap folder props if server doesn't support acl r=naving, sr=sspitzer
This commit is contained in:
parent
272d204c29
commit
f1346ee5c4
@ -23,7 +23,6 @@ var gFolderPropsSink = {
|
||||
var typeLabel = document.getElementById("folderType.text");
|
||||
if (typeLabel)
|
||||
{
|
||||
dump("folder type = "+ folderTypeString + "\n");
|
||||
typeLabel.setAttribute("value",folderTypeString);
|
||||
}
|
||||
// get the element for the folder type label and set value on it.
|
||||
@ -34,7 +33,6 @@ var gFolderPropsSink = {
|
||||
var folderTypeLabel = document.getElementById("folderDescription.text");
|
||||
if (folderTypeLabel)
|
||||
folderTypeLabel.setAttribute("value", folderDescription);
|
||||
dump("folder desc = "+ folderDescription + "\n");
|
||||
},
|
||||
|
||||
setFolderPermissions: function(folderPermissions)
|
||||
@ -42,8 +40,19 @@ var gFolderPropsSink = {
|
||||
var permissionsLabel = document.getElementById("folderPermissions.text");
|
||||
if (permissionsLabel)
|
||||
permissionsLabel.setAttribute("value",folderPermissions);
|
||||
dump("folder permissions = "+ folderPermissions + "\n");
|
||||
},
|
||||
|
||||
serverDoesntSupportACL : function()
|
||||
{
|
||||
var typeLabel = document.getElementById("folderTypeLabel");
|
||||
if (typeLabel)
|
||||
typeLabel.setAttribute("hidden", "true");
|
||||
var permissionsLabel = document.getElementById("permissionsDescLabel");
|
||||
if (permissionsLabel)
|
||||
permissionsLabel.setAttribute("hidden", "true");
|
||||
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -268,6 +277,8 @@ function onFolderPrivileges()
|
||||
var imapFolder = gMsgFolder.QueryInterface(Components.interfaces.nsIMsgImapMailFolder);
|
||||
if (imapFolder)
|
||||
imapFolder.folderPrivileges(gParentMsgWindow);
|
||||
// let's try closing the modal dialog to see if it fixes the various problems running this url
|
||||
window.close();
|
||||
}
|
||||
|
||||
|
||||
|
@ -94,12 +94,12 @@
|
||||
</vbox>
|
||||
<vbox hidable="true" hidefor="pop3,none,nntp" valign="top" align="start">
|
||||
<hbox>
|
||||
<label value="&folderType.label;"/>
|
||||
<label value="&folderType.label;" id="folderTypeLabel"/>
|
||||
<label value="" id="folderType.text"/>
|
||||
</hbox>
|
||||
<label value="" id="folderDescription.text"/>
|
||||
<label value=" " />
|
||||
<label value="&permissionsDesc.label;"/>
|
||||
<label value="&permissionsDesc.label;" id="permissionsDescLabel"/>
|
||||
<label value="" id="folderPermissions.text"/>
|
||||
<spacer flex="100%"/>
|
||||
<button iscontrolcontainer="true" hidable="true" label="&privileges.button.label;"
|
||||
|
@ -41,6 +41,6 @@
|
||||
<!ENTITY folderSharingTab.label "Sharing">
|
||||
<!ENTITY folderSharingTab.accesskey "s">
|
||||
<!ENTITY privilegesDesc.label "Share this and other folders with network users and display and set access privileges">
|
||||
<!ENTITY privileges.button.label "Privileges">
|
||||
<!ENTITY privileges.button.label "Privileges...">
|
||||
<!ENTITY permissionsDesc.label "You have the following permissions:">
|
||||
<!ENTITY folderType.label "Folder Type:">
|
||||
|
Loading…
Reference in New Issue
Block a user