amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-30 02:37:16 +00:00
Code Issues Projects Releases Wiki Activity

merge of '18a196ff2267018bcfe42ffec1c88757004fe621'

Browse Source 
and 'd5c8f082c4cdd11904c2520fd1a85e71f588fa59'

Monotone-Parent: 18a196ff2267018bcfe42ffec1c88757004fe621
Monotone-Parent: d5c8f082c4cdd11904c2520fd1a85e71f588fa59
Monotone-Revision: b601815254b395ef279eca302af8590015e1cc45

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-22T18:47:43
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert
2009-07-22 18:47:43 +00:00
parent 036496c825 975cfe3c1c
commit a0c170842a
2 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Scheduler/UIxCalListingActions.m
+22 -24
View File
@@ -323,29 +323,29 @@ static NSArray *tasksFields = nil;
{
if (![component isEqualToString: @"vtodo"] || [currentFolder showCalendarTasks])
{
if ([currentFolder isActive])
{
currentInfos
= [[currentFolder fetchCoreInfosFrom: startDate
to: endDate
title: title
component: component] objectEnumerator];
if ([currentFolder isActive])
{
currentInfos
= [[currentFolder fetchCoreInfosFrom: startDate
to: endDate
title: title
component: component] objectEnumerator];
while ((newInfo = [currentInfos nextObject]))
{
[newInfo setObject: [currentFolder nameInContainer]
forKey: @"c_folder"];
[newInfo setObject: [currentFolder ownerInContext: context]
forKey: @"c_owner"];
if (![[newInfo objectForKey: @"c_title"] length])
while ((newInfo = [currentInfos nextObject]))
{
[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]];
}
}
// 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]];
}
}
}
}
@@ -970,8 +970,7 @@ _computeBlocksPosition (NSArray *blocks)
forComponentOfType: @"vtodo"] objectEnumerator];
showCompleted = [[request formValueForKey: @"show-completed"] intValue];
task = [tasks nextObject];
while (task)
while (task = [tasks nextObject])
{
statusCode = [[task objectAtIndex: 2] intValue];
if (statusCode != 1 || showCompleted)
@@ -983,7 +982,6 @@ _computeBlocksPosition (NSArray *blocks)
[filteredTask addObject: statusFlag];
[filteredTasks addObject: filteredTask];
}
task = [tasks nextObject];
}
[filteredTasks sortUsingSelector: @selector (compareTasksAscending:)];
UI/Scheduler/product.plist
+1 -1
View File
@@ -234,7 +234,7 @@
protectedBy = "ViewAllComponent";
pageName = "UIxTaskEditor";
};
save = {
save = {
protectedBy = "ModifyComponent";
pageName = "UIxTaskEditor";
actionName = "save";