From 0fb7135335810a31c8936a3e58680f93c550b0c2 Mon Sep 17 00:00:00 2001 From: Alexandre Cloutier Date: Mon, 30 Jun 2014 13:36:12 -0400 Subject: [PATCH] bugfixes --- UI/Scheduler/UIxCalListingActions.m | 12 ++++-------- UI/WebServerResources/SchedulerUI.js | 15 ++++++++------- UI/WebServerResources/UIxCalViewPrint.js | 11 ++++++++--- UI/WebServerResources/error.png | Bin 0 -> 712 bytes UI/WebServerResources/notice.png | Bin 0 -> 476 bytes UI/WebServerResources/success.png | Bin 0 -> 704 bytes UI/WebServerResources/warning.png | Bin 0 -> 483 bytes 7 files changed, 20 insertions(+), 18 deletions(-) create mode 100755 UI/WebServerResources/error.png create mode 100755 UI/WebServerResources/notice.png create mode 100755 UI/WebServerResources/success.png create mode 100755 UI/WebServerResources/warning.png diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index 7c34b8f71..607dc9062 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -1051,7 +1051,7 @@ _computeBlocksPosition (NSArray *blocks) SOGoAppointmentFolder *folder; NSMutableArray *selectedCalendars; NSArray *folders; - NSString *fDisplayName; + NSString *fUID; NSNumber *isActive; unsigned int count, foldersCount; int max=0, i; @@ -1065,12 +1065,8 @@ _computeBlocksPosition (NSArray *blocks) folder = [folders objectAtIndex: count]; isActive = [NSNumber numberWithBool: [folder isActive]]; if ([isActive intValue] != 0) { - fDisplayName = [folder displayName]; - if (fDisplayName == nil) - fDisplayName = @""; - if ([fDisplayName isEqualToString: [co defaultFolderName]]) - fDisplayName = [self labelForKey: fDisplayName]; - [selectedCalendars addObject: fDisplayName]; + fUID = [folder nameInContainer]; + [selectedCalendars addObject: fUID]; } } return selectedCalendars; @@ -1098,7 +1094,7 @@ _computeBlocksPosition (NSArray *blocks) eventsForCalendar = [NSMutableArray array]; [self _prepareEventBlocks: &blocks withAllDays: &allDayBlocks]; for (j = 0; j < [events count]; j++) { - if ([[[events objectAtIndex:j] objectAtIndex:2] isEqualToString:[calendars objectAtIndex:i]]) { + if ([[[events objectAtIndex:j] objectAtIndex:1] isEqualToString:[calendars objectAtIndex:i]]) { [eventsForCalendar addObject: [events objectAtIndex:j]]; } } diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 8d2004357..75a5c89c7 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -417,13 +417,14 @@ function deleteEvent() { } function deleteEventFromListConfirm() { - if (document.deleteEventAjaxRequest) { - document.deleteEventAjaxRequest.aborted = true; - document.deleteEventAjaxRequest.abort(); - } - - _batchDeleteEvents(); - disposeDialog(); + if (document.deleteEventAjaxRequest) { + document.deleteEventAjaxRequest.aborted = true; + document.deleteEventAjaxRequest.abort(); + } + + _batchDeleteEvents(); + refreshTasks(); + disposeDialog(); } function deleteEventFromViewConfirm() { diff --git a/UI/WebServerResources/UIxCalViewPrint.js b/UI/WebServerResources/UIxCalViewPrint.js index 1fa1b6ddd..2eb382f73 100644 --- a/UI/WebServerResources/UIxCalViewPrint.js +++ b/UI/WebServerResources/UIxCalViewPrint.js @@ -123,15 +123,20 @@ function previewDisplayCallback(http) { } function addCalendarsColor () { - var activeCalendarsId = []; var allCalendars = window.parent$("calendarList"); var allColors = window.parentvar("UserSettings")['Calendar']['FolderColors']; + for (var i = 0; i < allCalendars.children.length; i++) { if (allCalendars.children[i].down("input").checked){ + owner = allCalendars.children[i].getAttribute("owner"); folderName = allCalendars.children[i].getAttribute("id").substr(1); - color = allColors["sogo1:Calendar/" + folderName]; + + color = allColors[owner + ":Calendar/" + folderName]; if (!color) { - color = "#AAAAAA"; + if(folderName.split("_")[1]) + color = allColors[owner + ":Calendar/" + folderName.split("_")[1]]; + else + color = "#AAAAAA"; } appendStyleElement(folderName, color); } diff --git a/UI/WebServerResources/error.png b/UI/WebServerResources/error.png new file mode 100755 index 0000000000000000000000000000000000000000..a9dd94184f2c3c754020366d8d5fa6dee5ea7319 GIT binary patch literal 712 zcmV;(0yq7MP)cmsS?wo4lcYIkX2Dcyy(gr(!z))qnE_>z+|`^|pe%+A?E5D`uS<~R{0gyT4v z0EW3|v|8&ZRe6v|@Ic6nK{L);6-EAAaHNBu6^!3dTQgPGKV&goz5;~h3JFbveSwF} zo7XZV75}+d{6kS=CQYf0#&DMh`|I?_Ck%MLs8jy63maVs7tN+Uxk28Sn0pRiM2HBB8w6JrE*aWP+Y zZDJfw*H%NNr3Tg>P5>Pu%`JdQ?|@-8bNet`>Of!XgS~#qe>=PCb=5(&sOe!in*rZ3IU@BMR`PJ-Vj@Qc(lL?V;`0000bIzyoa218B+vYtI8}%>;4T1%2%TWW(?E`@hxe1$*fMUAY8x-xPo31aH+*k1$W~DX2%0=)aByR0a>v`qx#|A&cNIB z09C63WyS<>*8yO?=j7D|eCrm4?o_DtLXg|z;LzRL%rb=227vMbT(;`x*}>raHJkZU zpy&c)#6gSF@Av-&cH!pZ)G>U==;hZCVzX18|!UgwoR0(?lR&`$L8MdcVSiGAbR4va7Ys6)pdYK*^2lL?024*cH7T) zDtcWOUr?uM_Z9@(5t%0bgpeBLQjQ~P?6$6#1{$`#M;)&Z z0|X`@L=mnxas|ZI(*J-!8;YutT&63NP9>7@=7#2|tk1CYBg^Y6gA2vQiMy{XB% z3by3dhL+KDeP^>Olo+!abX(tAYfN`^HzwPY9dGB}jaE&6-VX_FZs=?XMRI3)2eNj} zis`xzN@*R>dLDzBPV8j*L^eXgIqB>KFfrV-zdKEJ8Z!(7rfJr3w|m6jHg$O13t_QT zJeihGFyM5eDG{$$tFSD~M^>@+dkr_ESI|~&LZMK=wU@UrJ2wkXd0aZdfCCDYsO!4; ze0~aAS;NY&6{JWPPPHG0s;U@Ueu@{RS8zfOs7<5N2?l_<3^xv5#>~tNrVfqcXrdnv z`|tVk>(YBXD2@R!_%N0E&Q5?MR!hb@9r<<#ilQJK4&zbpeT3C87HdCodwB%BnS1{N zJ~pwabb=LpTwB*FN?gIKeY!HwYi?dT^(T>w zNv2u&`&`RKvQ6norZKLlYE&+{8;sfuwTeA&EOAHV(W-c-knB3jeh4qIFZ9jEu*dGp mq>u@;D8-;c_IjQF2`~VU=ra3;9NQxR0000d@1Dh0^Abt>J0}4S=#35+0g@P6V3!7jm2o@Ip1A-Qo60Jil1dI3w z1kwpAnpz7J5HwZTML}g}-@S4e!WK>u*b9d_oOABs-C}~fGtPvMkMl~y%ud$AUf+2__O`bBi z|6gEgj@hfu@;&(S6pDTR4w4`)4SC8aJ1Q7Gee>ATEn;s2{(OVx6u*8Kg19t!D5LDb zDY1Nd>Q1&h-S)yX^xs2c0_rVZKiCt*rO87XWwoQ-=;jbxo2Rc|gS~agCLwD