See ChangeLog.
Monotone-Parent: 3d26091bec393e3abf8d2b6033e0737e09c207b9 Monotone-Revision: 0c045ab1e972ecf31a2d5051abbc0ef141461d10 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-02-10T20:56:45 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
8cef32c611
commit
914373e4a8
|
@ -1,3 +1,8 @@
|
||||||
|
2012-02-22 Francis Lachapelle <flachapelle@inverse.ca>
|
||||||
|
|
||||||
|
* UI/WebServerResources/UIxAclEditor.js (addUser): fixed case when
|
||||||
|
both canSubscribeUsers and isPublicAccessEnabled are disabled.
|
||||||
|
|
||||||
2012-02-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2012-02-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
* SoObjects/SOGo/SQLSource.m (_lookupContactEntry:considerEmail:):
|
* SoObjects/SOGo/SQLSource.m (_lookupContactEntry:considerEmail:):
|
||||||
|
|
|
@ -21,16 +21,22 @@ function addUser(userName, userID, type) {
|
||||||
var nextLi = null;
|
var nextLi = null;
|
||||||
while (count > -1 && !nextLi) {
|
while (count > -1 && !nextLi) {
|
||||||
if ($(lis[count]).hasClassName("normal-user")) {
|
if ($(lis[count]).hasClassName("normal-user")) {
|
||||||
nextLi = lis[count+1];
|
if ((count+1) < lis.length)
|
||||||
|
ul.insertBefore(newNode, lis[count+1]);
|
||||||
|
else
|
||||||
|
ul.appendChild(newNode);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
count--;
|
count--;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!nextLi) {
|
if (!nextLi) {
|
||||||
nextLi = lis[0];
|
if (count > 0)
|
||||||
|
ul.insertBefore(newNode, lis[0]);
|
||||||
|
else
|
||||||
|
ul.appendChild(newNode);
|
||||||
}
|
}
|
||||||
ul.insertBefore(newNode, nextLi);
|
|
||||||
|
|
||||||
var url = window.location.href;
|
var url = window.location.href;
|
||||||
var elements = url.split("/");
|
var elements = url.split("/");
|
||||||
|
@ -188,13 +194,16 @@ function onAclLoadHandler() {
|
||||||
for (var i = 0; i < lis.length; i++)
|
for (var i = 0; i < lis.length; i++)
|
||||||
setEventsOnUserNode(lis[i]);
|
setEventsOnUserNode(lis[i]);
|
||||||
|
|
||||||
defaultUserID = $("defaultUserID").value;
|
var input = $("defaultUserID");
|
||||||
var userNode = nodeForUser(_("Any Authenticated User"),
|
if (input) {
|
||||||
defaultUserID);
|
defaultUserID = $("defaultUserID").value;
|
||||||
userNode.addClassName("any-user");
|
var userNode = nodeForUser(_("Any Authenticated User"),
|
||||||
userNode.setAttribute("title",
|
defaultUserID);
|
||||||
_("Any user not listed above"));
|
userNode.addClassName("any-user");
|
||||||
ul.appendChild(userNode);
|
userNode.setAttribute("title",
|
||||||
|
_("Any user not listed above"));
|
||||||
|
ul.appendChild(userNode);
|
||||||
|
}
|
||||||
if (isPublicAccessEnabled && CurrentModule() != "Mail") {
|
if (isPublicAccessEnabled && CurrentModule() != "Mail") {
|
||||||
userNode = nodeForUser(_("Public Access"), "anonymous");
|
userNode = nodeForUser(_("Public Access"), "anonymous");
|
||||||
userNode.addClassName("anonymous-user");
|
userNode.addClassName("anonymous-user");
|
||||||
|
|
|
@ -48,7 +48,7 @@ function addUserLineToTree(tree, parent, line) {
|
||||||
if (line[4] && !line[4].empty())
|
if (line[4] && !line[4].empty())
|
||||||
email += ", " + line[4].split("\n").join("; "); // extra contact info
|
email += ", " + line[4].split("\n").join("; "); // extra contact info
|
||||||
var icon_card = 'abcard.png';
|
var icon_card = 'abcard.png';
|
||||||
var datatype = 'person';
|
var datatype = 'user';
|
||||||
if (line[3]) {
|
if (line[3]) {
|
||||||
icon_card = 'ablist.png';
|
icon_card = 'ablist.png';
|
||||||
datatype = 'group';
|
datatype = 'group';
|
||||||
|
|
Loading…
Reference in a new issue