mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-04-18 03:38:49 +00:00
merge of '1acff2251868501e5baba3465e49475362ce1e4b'
and '68057140404e926c49422f77445d1b382fc182e5' Monotone-Parent: 1acff2251868501e5baba3465e49475362ce1e4b Monotone-Parent: 68057140404e926c49422f77445d1b382fc182e5 Monotone-Revision: 434c3721a8dac924cce0531eebee09d9b27457ea Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-09-20T14:29:04 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -977,14 +977,14 @@ function onAddressBookModify(event) {
|
||||
var selected = folders.getSelectedNodes()[0];
|
||||
|
||||
if (UserLogin == selected.getAttribute("owner")) {
|
||||
var currentName = selected.innerHTML;
|
||||
var currentName = selected.innerHTML.unescapeHTML();
|
||||
showPromptDialog(_("Properties"),
|
||||
_("Address Book Name"),
|
||||
onAddressBookModifyConfirm,
|
||||
currentName);
|
||||
}
|
||||
else
|
||||
showAlertDialog(_("Unable to rename that folder!"));
|
||||
showAlertDialog(_("Unable to rename that folder!")); // WARNING: super users will end up here
|
||||
}
|
||||
|
||||
function onAddressBookModifyConfirm() {
|
||||
@@ -1046,7 +1046,7 @@ function onAddressBooksMenuPrepareVisibility() {
|
||||
// Disable the "Sharing" and "Modify" options when address book
|
||||
// is not owned by user
|
||||
if (folderOwner == UserLogin || IsSuperUser) {
|
||||
modifyOption.removeClassName("disabled");
|
||||
modifyOption.removeClassName("disabled"); // WARNING: will fail for super users anyway
|
||||
sharingOption.removeClassName("disabled");
|
||||
}
|
||||
else {
|
||||
|
||||
Reference in New Issue
Block a user