git-svn-id: http://svn.opengroupware.org/SOGo/trunk@127 d1b88da0-ebda-0310-925b-ed51d...

diff --git a/SOGo/UI/Scheduler/UIxCalView.m b/SOGo/UI/Scheduler/UIxCalView.m
index 26120a93015eab5c1531b4b70a0765b636936471..fe0b42a520cfe4bfad1fa97c425de88f9220f5d1 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalView.m
+++ b/SOGo/UI/Scheduler/UIxCalView.m
@@ -42,7 +42,6 @@
 }
 
 - (NSString *)shortTextForApt {
-#if 1
   NSCalendarDate *startDate;
   NSString *ms;
   
@@ -52,31 +51,17 @@
                 [startDate minuteOfHour],
                 [[self appointment] valueForKey:@"title"]];
   return ms;
-#else
-  UIxAppointmentFormatter *f;
-  
-  f = [UIxAppointmentFormatter formatterWithFormat:
-        @"%S - %E;\n%T;\n%L;\n%5P;\n%50R"];
-  [f setRelationDate:[self referenceDateForFormatter]];
-  [f setShowFullNames:[self showFullNames]];
-  if([self showAMPMDates])
-        [f switchToAMPMTimes:YES];
-    
-  return [NSString stringWithFormat:@"%@:\n%@",
-        [self aptTypeLabel],
-        [f stringForObjectValue:self->appointment]];
-#endif
 }
 
 - (NSString *)shortTitleForApt {
-    NSString *title;
+  NSString *title;
     
-    title = [self->appointment valueForKey:@"title"];
-    if([title length] > 12) {
+  title = [self->appointment valueForKey:@"title"];
+  if([title length] > 12) {
         title = [NSString stringWithFormat:@"%@...",
             [title substringToIndex:11]];
-    }
-    return title;
+  }
+  return title;
 }
 
 - (NSCalendarDate *)referenceDateForFormatter {
@@ -127,7 +112,7 @@
 - (NSString *)appointmentViewURL {
   id pkey;
   
-  if ((pkey = [[self appointment] valueForKey:@"dateId"]) == nil)
+  if ((pkey = [[self appointment] valueForKey:@"uid"]) == nil)
     return nil;
   
   return [NSString stringWithFormat:@"%@/view", pkey];