removed workaround due to recent bugfix in NGObjWeb

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

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 5e15dc34a8efa80da5ea1be9d7cd3f8a23d7798a..afc2a82339df9a90b8d284f240506a8001e156a1 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-18  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * UIxCalScheduleOverview.[wox,m]: removed workaround for NGObjWeb bug,
+         code cleanup (v0.9.105)
+
 2004-12-17  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.104

diff --git a/SOGo/UI/Scheduler/UIxCalScheduleOverview.m b/SOGo/UI/Scheduler/UIxCalScheduleOverview.m
index 06cd0b6d5633a3965b1d1e9be3999152f9d00cb1..5c0b9ed318da85f850dd987499cfadd4538a911b 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalScheduleOverview.m
+++ b/SOGo/UI/Scheduler/UIxCalScheduleOverview.m
@@ -85,14 +85,12 @@
   self->partNames  = [[ps componentsSeparatedByString:@"\n"] retain];
   ps               = [self->item valueForKey:@"partstates"];
   self->partStates = [[ps componentsSeparatedByString:@"\n"] retain];
-  NSLog(@"new item:%@", self->item);
 }
 - (id)item {
   return self->item;
 }
 
 - (void)setParticipantIndex:(unsigned)_participantIndex {
-  NSLog(@"_participantIndex:%d", _participantIndex);
   self->participantIndex = _participantIndex;
 }
 - (unsigned)participantIndex {
@@ -115,31 +113,15 @@
 }
 
 - (NSString *)participant {
-  [self logWithFormat:@"participant(%d):%@",
-    self->participantIndex,
-    [self->partNames objectAtIndex:self->participantIndex]];
   return [self->partNames objectAtIndex:self->participantIndex];
 }
 
 - (NSString *)participationStatus {
-  [self logWithFormat:@"state(%d):%@",
-    self->participantIndex,
-    [self->partStates objectAtIndex:self->participantIndex]];
   return [self->partStates objectAtIndex:self->participantIndex];
 }
 
 - (unsigned)maxRenderedParticipantsCount {
-  return 2;
-}
-
-// TODO: find the bug in WORepetition and get rid of this!
-- (NSArray *)renderedParticipants {
-  NSRange r;
-  
-  r = NSMakeRange(0, [self renderedParticipantsCount]);
-  return [self->partNames subarrayWithRange:r];
-}
-- (void)setFoo:(id)_foo {
+  return 3;
 }
 
 - (unsigned)renderedParticipantsCount {
@@ -153,8 +135,8 @@
 }
 
 - (BOOL)didTruncateParticipants {
-  return [self participantsCount] > [self maxRenderedParticipantsCount] ? YES
-                                                                        : NO;
+  return [self participantsCount] >
+         ([self maxRenderedParticipantsCount] + 1) ? YES : NO;
 }
 
 

diff --git a/SOGo/UI/Scheduler/UIxCalScheduleOverview.wox b/SOGo/UI/Scheduler/UIxCalScheduleOverview.wox
index 57d93c6ccdcfa517d97b1bd00f6db7fa10e4bafd..586c0f1682d71567609b1d8a8e6980da12189324 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalScheduleOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalScheduleOverview.wox
@@ -94,9 +94,8 @@
                                      cellspacing="0"
                                      class="schedoverview"
                               >
-                                <var:foreach list="renderedParticipants"
+                                <var:foreach count="renderedParticipantsCount"
                                              index="participantIndex"
-                                             item="foo"
                                 >
                                   <tr>
                                     <td class="schedoverview">
@@ -168,9 +167,8 @@
                                      cellspacing="2"
                                      class="schedoverview"
                               >
-                                <var:foreach list="renderedParticipants"
+                                <var:foreach count="renderedParticipantsCount"
                                              index="participantIndex"
-                                             item="foo"
                                 >
                                   <tr>
                                     <td class="schedoverview">

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 07748cc2bdc50162ac78f504f64bf5752f796f4b..13b2c93d4fad612a354b115749a20f321a1ea8d0 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,7 +1,8 @@
 # $Id$
 
-SUBMINOR_VERSION:=104
+SUBMINOR_VERSION:=105
 
+# v0.9.105 requires NGObjWeb     v4.5.102
 # v0.9.101 requires NGiCal       v4.5.36
 # v0.9.100 requires SOGoUI       v0.9.21
 # v0.9.99  requires SOGoUI       v0.9.20