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

Fix for bug #589

Browse Source
This commit is contained in:
Ludovic Marcotte
2014-09-25 09:25:13 -04:00
parent 3675220756
commit 0b6e3dc22d
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
UI/Scheduler/UIxTaskEditor.m
View File

@@ -41,6 +41,8 @@
#import <SOGo/SOGoDateFormatter.h>
#import <SOGo/SOGoUser.h>
#import <SOGo/SOGoUserDefaults.h>
#import <Appointments/iCalEntityObject+SOGo.h>
#import <Appointments/SOGoAppointmentFolder.h>
#import <Appointments/SOGoTaskObject.h>
@@ -213,13 +215,12 @@
- (BOOL) statusDateDisabled
{
return ![status isEqualToString: @"COMPLETED"];
return !([status isEqualToString: @"COMPLETED"] || statusDate);
}
- (BOOL) statusPercentDisabled
{
return ([status length] == 0
|| [status isEqualToString: @"CANCELLED"]);
return ([status length] == 0 || [status isEqualToString: @"CANCELLED"]);
}
- (void) setStatusPercent: (NSString *) newStatusPercent
@@ -311,11 +312,15 @@
hasDueDate = YES;
else
dueDate = [self newStartDate];
ASSIGN (statusDate, [todo completed]);
[statusDate setTimeZone: timeZone];
ASSIGN (status, [todo status]);
if ([status isEqualToString: @"COMPLETED"])
if ([status length] == 0 && statusDate)
{
ASSIGN (statusDate, [todo completed]);
[statusDate setTimeZone: timeZone];
ASSIGN(status, @"COMPLETED");
}
else
{