amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-11 16:28:51 +00:00
Code Issues Projects Releases Wiki Activity

merge of '0c53de1af9568d623ce0caee5e1b914df12b40bb'

Browse Source 
and '3015b169187acab527747642b2900806a48dbe60'

Monotone-Parent: 0c53de1af9568d623ce0caee5e1b914df12b40bb
Monotone-Parent: 3015b169187acab527747642b2900806a48dbe60
Monotone-Revision: 7238e3a0d03138ec5ff31751dee6c1f8d162b693

Monotone-Author: flachapelle@inverse.ca
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-08-18T01:06:23
Monotone-Date: 2009-08-18T16:52:24
Monotone-Branch: ca.inverse.sogo
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-08-18 01:06:23 +00:00
parent d09c9cd605 25a73572fa
commit a22876a72e
2 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UI/MainUI/product.plist
View File

@@ -1,5 +1,5 @@
{
requires = ( MAIN, CommonUI );
requires = ( MAIN, Appointments, CommonUI );
publicResources = (
);

68
UI/Scheduler/UIxCalListingActions.m
View File

@@ -321,44 +321,42 @@ static NSArray *tasksFields = nil;
folders = [[clientObject subFolders] objectEnumerator];
while ((currentFolder = [folders nextObject]))
{
if (![component isEqualToString: @"vtodo"] || [currentFolder showCalendarTasks])
if ([currentFolder isActive]
&& (![component isEqualToString: @"vtodo"] || [currentFolder showCalendarTasks]))
{
if ([currentFolder isActive])
{
currentInfos
= [[currentFolder fetchCoreInfosFrom: startDate
to: endDate
title: title
component: component] objectEnumerator];
currentInfos
= [[currentFolder fetchCoreInfosFrom: startDate
to: endDate
title: title
component: component] objectEnumerator];
while ((newInfo = [currentInfos nextObject]))
while ((newInfo = [currentInfos nextObject]))
{
if ([fields containsObject: @"editable"])
{
if ([fields containsObject: @"editable"])
{
role =
[currentFolder roleForComponentsWithAccessClass:
[[newInfo objectForKey: @"c_classification"] intValue]
forUser: userLogin];
if ([role isEqualToString: @"ComponentModifier"]
|| [role length] == 0)
[newInfo setObject: [NSNumber numberWithInt: 1]
forKey: @"editable"];
else
[newInfo setObject: [NSNumber numberWithInt: 0]
forKey: @"editable"];
}
[newInfo setObject: [currentFolder nameInContainer]
forKey: @"c_folder"];
[newInfo setObject: [currentFolder ownerInContext: context]
forKey: @"c_owner"];
if (![[newInfo objectForKey: @"c_title"] length])
[self _fixComponentTitle: newInfo withType: component];
// Possible improvement: only call _fixDates if event is recurrent
// or the view range span a daylight saving time change
[self _fixDates: newInfo];
[infos addObject: [newInfo objectsForKeys: fields
notFoundMarker: marker]];
role =
[currentFolder roleForComponentsWithAccessClass:
[[newInfo objectForKey: @"c_classification"] intValue]
forUser: userLogin];
if ([role isEqualToString: @"ComponentModifier"]
|| [role length] == 0)
[newInfo setObject: [NSNumber numberWithInt: 1]
forKey: @"editable"];
else
[newInfo setObject: [NSNumber numberWithInt: 0]
forKey: @"editable"];
}
[newInfo setObject: [currentFolder nameInContainer]
forKey: @"c_folder"];
[newInfo setObject: [currentFolder ownerInContext: context]
forKey: @"c_owner"];
if (![[newInfo objectForKey: @"c_title"] length])
[self _fixComponentTitle: newInfo withType: component];
// Possible improvement: only call _fixDates if event is recurrent
// or the view range span a daylight saving time change
[self _fixDates: newInfo];
[infos addObject: [newInfo objectsForKeys: fields
notFoundMarker: marker]];
}
}
}
@@ -994,7 +992,7 @@ _computeBlocksPosition (NSArray *blocks)
}
while (task = [tasks nextObject])
while ((task = [tasks nextObject]))
{
statusCode = [[task objectAtIndex: 2] intValue];
if (statusCode != 1 || showCompleted)