[Vtigercrm-commits] [vtiger-commits] r7670 - in /vtigercrm/trunk: include/js/general.js modules/Users/DefaultDataPopulator.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Thu Jun 29 07:53:35 2006
New Revision: 7670

Log:
issue in ajax edit has been fixed .Fixes #1388

Modified:
    vtigercrm/trunk/include/js/general.js
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/trunk/include/js/general.js
==============================================================================
--- vtigercrm/trunk/include/js/general.js (original)
+++ vtigercrm/trunk/include/js/general.js Thu Jun 29 07:53:35 2006
@@ -819,30 +819,33 @@
 	}
        //added to check Start Date & Time,if Activity Status is Planned.//start
         for (var j=0; j<fieldname.length; j++)
+	{
+
+		if(getObj(fieldname[j]) != null)
 		{
-
-			if(getObj(fieldname[j]) != null)
+			if(fieldname[j] == "date_start")
 			{
-				if(fieldname[j] == "date_start")
-				{
-					var datelabel = fieldlabel[j]
-						var datefield = fieldname[j]
-						var startdatevalue = getObj(datefield).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
-				}
-				if(fieldname[j] == "time_start")
-				{
-					var timelabel = fieldlabel[j]
-						var timefield = fieldname[j]
-						var timeval=getObj(timefield).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
-				}
-				if(fieldname[j] == "eventstatus" || fieldname[j] == "taskstatus")
-				{
-					var statusvalue = getObj(fieldname[j]).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
-						var statuslabel = fieldlabel[j++]
-				}
+				var datelabel = fieldlabel[j]
+					var datefield = fieldname[j]
+					var startdatevalue = getObj(datefield).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
 			}
+			if(fieldname[j] == "time_start")
+			{
+				var timelabel = fieldlabel[j]
+					var timefield = fieldname[j]
+					var timeval=getObj(timefield).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
+			}
+			if(fieldname[j] == "eventstatus" || fieldname[j] == "taskstatus")
+			{
+				var statusvalue = getObj(fieldname[j]).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
+					var statuslabel = fieldlabel[j++]
+			}
+		}else
+		{
+			return true;
 		}
-		if(statusvalue == "Planned")
+	}
+	if(statusvalue == "Planned")
         {
                 var dateelements=splitDateVal(startdatevalue)
 

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Thu Jun 29 07:53:35 2006
@@ -537,7 +537,7 @@
 //Event Details --START
 //Block41-43-- Start
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'V~M',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");