LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix rename of subscribed addressbooks

pull/64/head
Francis Lachapelle 2014-11-05 10:02:55 -05:00
parent 15be4861b6
commit 7052daa1c8
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -15,6 +15,7 @@ Bug fixes
- fixed many interop issues with Windows Phones over ActiveSync - fixed many interop issues with Windows Phones over ActiveSync
- fixed automatic return receipts crash when not in the recepient list (#2965) - fixed automatic return receipts crash when not in the recepient list (#2965)
- fixed support for Sieve folder encoding parameter (#2622) - fixed support for Sieve folder encoding parameter (#2622)
- fixed rename of subscribed addressbooks
2.2.9a (2014-09-29) 2.2.9a (2014-09-29)
------------------- -------------------

2
UI/Common/product.plist
View File

@ -107,7 +107,7 @@
actionName = "subscribeUsers"; actionName = "subscribeUsers";
}; };
renameFolder = { renameFolder = {
protectedBy = "Change Permissions"; protectedBy = "Access Contents Information";
actionClass = "UIxFolderActions"; actionClass = "UIxFolderActions";
actionName = "renameFolder"; actionName = "renameFolder";
}; };

10
UI/WebServerResources/ContactsUI.js
View File

@ -1113,19 +1113,14 @@ function onAddressBooksMenuPrepareVisibility() {
var menu = $("contactFoldersMenu").down("ul");; var menu = $("contactFoldersMenu").down("ul");;
var listElements = menu.childNodesWithTag("li"); var listElements = menu.childNodesWithTag("li");
var modifyOption = listElements[0];
var newListOption = listElements[3]; var newListOption = listElements[3];
var removeOption = listElements[5]; var removeOption = listElements[5];
var exportOption = listElements[7]; var exportOption = listElements[7];
var importOption = listElements[8]; var importOption = listElements[8];
var sharingOption = listElements[listElements.length - 1]; var sharingOption = listElements[listElements.length - 1];
// Disable the "Sharing" and "Modify" options when address book // Disable the "Sharing" option when address book is not owned by user
// is not owned by user
if (folderOwner == UserLogin || IsSuperUser) { if (folderOwner == UserLogin || IsSuperUser) {
modifyOption.removeClassName("disabled"); // WARNING: will fail
// for super users
// anyway
var aclEditing = selected[0].getAttribute("acl-editing"); var aclEditing = selected[0].getAttribute("acl-editing");
if (aclEditing && aclEditing == "available") { if (aclEditing && aclEditing == "available") {
sharingOption.removeClassName("disabled"); sharingOption.removeClassName("disabled");
@ -1147,8 +1142,7 @@ function onAddressBooksMenuPrepareVisibility() {
newListOption.addClassName("disabled"); newListOption.addClassName("disabled");
} }
/* Disable the "remove" and "export ab" options when address book is // Disable the "remove" and "export ab" options when address book is public
public */
if (folderOwner == "nobody") { if (folderOwner == "nobody") {
exportOption.addClassName("disabled"); exportOption.addClassName("disabled");
importOption.addClassName("disabled"); importOption.addClassName("disabled");