[Vtigercrm-commits] [vtiger-commits] r10088 - /vtigercrm/branches/5.0.3/modules/Calendar/ActivityAjax.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Fri Jan 19 05:00:12 2007
New Revision: 10088

Log:
event status change is not displayed properly at weekly view. Fixes #2743

Modified:
    vtigercrm/branches/5.0.3/modules/Calendar/ActivityAjax.php

Modified: vtigercrm/branches/5.0.3/modules/Calendar/ActivityAjax.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/ActivityAjax.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/ActivityAjax.php Fri Jan 19 05:00:12 2007
@@ -99,10 +99,6 @@
 		}
 		$calendar_arr['calendar'] = new Calendar($mysel,$date_data);
 		
-		if ($mysel == 'day' || $mysel == 'week' || $mysel == 'month' || $mysel == 'year')
-		{
-			$calendar_arr['calendar']->add_Activities($current_user);
-		}
 		$calendar_arr['view'] = $mysel;
 		if($calendar_arr['calendar']->view == 'day')
 			$start_date = $end_date = $calendar_arr['calendar']->date_time->get_formatted_date();
@@ -150,6 +146,11 @@
 			if($type == 'activity_postpone')
 			{
 			}
+			if ($mysel == 'day' || $mysel == 'week' || $mysel == 'month' || $mysel == 'year')
+                	{
+                        	$calendar_arr['calendar']->add_Activities($current_user);
+                	}
+
 			if(isset($_REQUEST['viewOption']) && $_REQUEST['viewOption'] != null && $subtab == 'event')
 			{
 				if($_REQUEST['viewOption'] == 'hourview')