propagate from branch 'ca.inverse.sogo.1_3_15' (head 908e524c769a51dae0dcb912328a3f394bff90c0)
to branch 'ca.inverse.sogo' (head 60ad1ae0d352bd61f6595c24b454acb729bdaadf) Monotone-Parent: 60ad1ae0d352bd61f6595c24b454acb729bdaadf Monotone-Parent: 908e524c769a51dae0dcb912328a3f394bff90c0 Monotone-Revision: 16aec26ecea8175e4cfbd9c57753b8ecc71fafe9 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-05-14T19:04:17 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
commit
88065426fe
|
@ -1,5 +1,9 @@
|
|||
2012-05-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* UI/WebServerResources/generic.js (subscribeToFolder): prepend a
|
||||
"/" to the folder name, as it comes originally in the form
|
||||
user:module/folder.
|
||||
|
||||
* UI/WebServerResources/UIxPreferences.js (initMailAccounts)
|
||||
(displayMailAccount): getElementsByTagName seems too standard for
|
||||
IE, we use $$() now so that we can invoke "each" on the result set
|
||||
|
|
|
@ -1211,7 +1211,7 @@ function subscribeToFolder(refreshCallback, refreshCallbackData) {
|
|||
var folderPath = folderData[1];
|
||||
if (username != UserLogin) {
|
||||
var url = (UserFolderURL + "../" + username
|
||||
+ folderPath + "/subscribe");
|
||||
+ "/" + folderPath + "/subscribe");
|
||||
if (document.subscriptionAjaxRequest) {
|
||||
document.subscriptionAjaxRequest.aborted = true;
|
||||
document.subscriptionAjaxRequest.abort();
|
||||
|
@ -1266,10 +1266,10 @@ function accessToSubscribedFolder(serverFolder) {
|
|||
var username = parts[0];
|
||||
var paths = parts[1].split("/");
|
||||
if (username == UserLogin) {
|
||||
folder = paths[2];
|
||||
folder = paths[1];
|
||||
}
|
||||
else {
|
||||
folder = "/" + username.asCSSIdentifier() + "_" + paths[2];
|
||||
folder = "/" + username.asCSSIdentifier() + "_" + paths[1];
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
Loading…
Reference in a new issue