From 80da504636e4b55ccfc8034e762aa6b00ab35df7 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 19 Sep 2007 20:00:10 +0000 Subject: [PATCH] Monotone-Parent: feca1919ae107b140918af5831c9094fd2ceb325 Monotone-Revision: 96effe6b8b81620e6321b228cbab54c6d0ff3555 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-09-19T20:00:10 Monotone-Branch: ca.inverse.sogo --- UI/Scheduler/UIxComponentEditor.m | 2 +- UI/WebServerResources/UIxComponentEditor.js | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m index 5cfeecaf4..9046b3229 100644 --- a/UI/Scheduler/UIxComponentEditor.m +++ b/UI/Scheduler/UIxComponentEditor.m @@ -358,7 +358,7 @@ { NSArray *calendars; - calendars = [[self calendarList] valueForKey: @"folder"]; + calendars = [[self calendarList] valueForKey: @"nameInContainer"]; return [calendars componentsJoinedByString: @","]; } diff --git a/UI/WebServerResources/UIxComponentEditor.js b/UI/WebServerResources/UIxComponentEditor.js index a00b4d16d..8aa9c1124 100644 --- a/UI/WebServerResources/UIxComponentEditor.js +++ b/UI/WebServerResources/UIxComponentEditor.js @@ -74,13 +74,7 @@ function onChangeCalendar(event) { var form = document.forms["editform"]; var urlElems = form.getAttribute("action").split("/"); var choice = calendars[this.value]; - var ownerLogin; - if (choice.indexOf(":") > -1) - ownerLogin = choice.split(":")[0]; - else - ownerLogin = UserLogin; - urlElems[urlElems.length-4] = ownerLogin; - + urlElems[urlElems.length-3] = choice; form.setAttribute("action", urlElems.join("/")); }