propagate from branch 'ca.inverse.sogo.1_3_15' (head 4806c2af0bd085e4a9d26b15d540681d4a14cb0a)

to branch 'ca.inverse.sogo' (head 16aec26ecea8175e4cfbd9c57753b8ecc71fafe9)

Monotone-Parent: 16aec26ecea8175e4cfbd9c57753b8ecc71fafe9
Monotone-Parent: 4806c2af0bd085e4a9d26b15d540681d4a14cb0a
Monotone-Revision: 2978fb164d72d09703322ba90dde130c04b410b2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T19:06:30
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2012-05-14 19:06:30 +00:00
commit 7895169695
3 changed files with 5 additions and 5 deletions

View File

@ -1,5 +1,9 @@
2012-05-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/UIxContactsUserFolders.js: folder ids are
in the form "user:module/folder", therefore we must remove the
first char, which is a slash.
* UI/WebServerResources/generic.js (subscribeToFolder): prepend a
"/" to the folder name, as it comes originally in the form
user:module/folder.

View File

@ -1,5 +1,3 @@
/* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
var listFilter = 'view_today';
var listOfSelection = null;

View File

@ -1,5 +1,3 @@
/* -*- Mode: java; tab-width: 2; c-label-minimum-indentation: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
var d;
function onSearchFormSubmit() {
@ -182,7 +180,7 @@ function addFolderBranchToTree(tree, user, folder, nodeId, subId, isLast) {
icon += 'tb-mail-addressbook-flat-16x16.png';
else
icon += 'calendar-folder-16x16.png';
var folderId = user + ":" + folderInfos[1];
var folderId = user + ":" + folderInfos[1].substr(1);
var name = folderInfos[0]; // name has the format "Folername (Firstname Lastname <email>)"
var pos = name.lastIndexOf(' (');
if (pos > -1)