amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-24 07:32:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix for bug #499.

Browse Source 
Monotone-Parent: 7fdcd24631a35711947a53ef3bec828c99f953bf
Monotone-Revision: 9de427ab0a6d798a88bf25730ef5135e63d0b420

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-03-30T20:51:29
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2010-03-30 20:51:29 +00:00
parent 303f168159
commit ebd2d98c5a
1 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
UI/WebServerResources/AdministrationUI.js
View File

@@ -31,8 +31,8 @@ function usersSearchCallback(http) {
document.userFoldersRequest = null;
var div = $("administrationContent");
if (http.status == 200) {
var response = http.responseText;
buildUsersTree(div, http.responseText)
var response = http.responseText.evalJSON();
buildUsersTree(div, response)
}
else if (http.status == 404)
div.update();
@@ -61,24 +61,19 @@ function buildUsersTree(treeDiv, response) {
var isUserDialog = false;
var multiplier = ((isUserDialog) ? 1 : 2);
if (response.length) {
var lines = response.split("\n");
for (var i = 0; i < lines.length; i++) {
if (lines[i].length > 0)
addUserLineToTree(d, 1 + i * multiplier, lines[i]);
}
if (response.length > 0) {
for (var i = 0; i < response.length; i++)
addUserLineToTree(d, 1 + i * multiplier, response[i]);
treeDiv.innerHTML = "";
treeDiv.appendChild(d.domObject ());
treeDiv.clean = false;
for (var i = 0; i < lines.length - 1; i++) {
if (lines[i].length > 0) {
if (!isUserDialog) {
var toggle = $("tgd" + (1 + i * 2));
toggle.observe ("click", onUserNodeToggle);
}
var sd = $("sd" + (1 + i * multiplier));
sd.observe("click", onTreeItemClick);
for (var i = 0; i < response.length; i++) {
if (!isUserDialog) {
var toggle = $("tgd" + (1 + i * 2));
toggle.observe ("click", onUserNodeToggle);
}
var sd = $("sd" + (1 + i * multiplier));
sd.observe("click", onTreeItemClick);
}
}
}
@@ -86,11 +81,10 @@ function buildUsersTree(treeDiv, response) {
function addUserLineToTree(tree, parent, line) {
var icon = ResourcesURL + '/busy.gif';
var userInfos = line.split(":");
var email = userInfos[1] + " &lt;" + userInfos[2] + "&gt;";
if (userInfos[3] && !userInfos[3].empty())
email += ", " + userInfos[3]; // extra contact info
tree.add(parent, 0, email, 0, '#', userInfos[0], 'person',
var email = line[1] + " &lt;" + line[2] + "&gt;";
if (line[3] && !line[3].empty())
email += ", " + line[3]; // extra contact info
tree.add(parent, 0, email, 0, '#', line[0], 'person',
'', '',
ResourcesURL + '/abcard.gif',
ResourcesURL + '/abcard.gif');
@@ -133,13 +127,10 @@ function foldersSearchCallback(http) {
var user = http.callbackData["user"];
dd.innerHTML = '';
for (var i = 1; i < folders.length - 1; i++) {
dd.appendChild(addFolderBranchToTree (d, user, folders[i], nodeId, i, false));
log (i + " = " + folders[i]);
}
dd.appendChild (addFolderBranchToTree (d, user, folders[folders.length-1], nodeId,
(folders.length - 1), true));
log ((folders.length - 1) + " = " + folders[folders.length-1]);
for (var i = 1; i < folders.length - 1; i++)
dd.appendChild(addFolderBranchToTree (d, user, folders[i], nodeId, i, false));
dd.appendChild (addFolderBranchToTree (d, user, folders[folders.length-1], nodeId,
(folders.length - 1), true));
for (var i = 1; i < folders.length; i++) {
var sd = $("sd" + (nodeId + i));
sd.observe("click", onTreeItemClick);
@@ -148,7 +139,7 @@ function foldersSearchCallback(http) {
}
else {
dd.innerHTML = '';
dd.appendChild (addFolderNotFoundNode (d, nodeId));
dd.appendChild (addFolderNotFoundNode (d, nodeId, null));
var sd = $("sd" + (nodeId + 1));
sd.observe("click", onTreeItemClick);
}