[Vtigercrm-commits] [vtiger-commits] r10979 - in /vtigercrm/branches/5.0.3/modules: Settings/EditDefOrgFieldLevelAccess.php Settings/UpdateDefaultFieldLevelAccess.php Settings/profilePrivileges.php Users/SaveProfile.php Users/UpdateProfileChanges.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Wed May 23 04:47:20 2007
New Revision: 10979

Log:
fix for Event - Activity Type issue. Fixes #3861 --minnie

Modified:
    vtigercrm/branches/5.0.3/modules/Settings/EditDefOrgFieldLevelAccess.php
    vtigercrm/branches/5.0.3/modules/Settings/UpdateDefaultFieldLevelAccess.php
    vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php
    vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php
    vtigercrm/branches/5.0.3/modules/Users/UpdateProfileChanges.php

Modified: vtigercrm/branches/5.0.3/modules/Settings/EditDefOrgFieldLevelAccess.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/EditDefOrgFieldLevelAccess.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/EditDefOrgFieldLevelAccess.php Wed May 23 04:47:20 2007
@@ -36,7 +36,6 @@
 	$language_strings = return_module_language($current_language,$fld_module);
 	$allfields[$fld_module] = getStdOutput($fieldListResult, $noofrows, $language_strings,$profileid);
 }
-
 if($_REQUEST['fld_module'] != '')
 	$smarty->assign("DEF_MODULE",$_REQUEST['fld_module']);
 else
@@ -57,15 +56,15 @@
 	{
 		$uitype = $adb->query_result($fieldListResult,$i,"uitype");
 		$displaytype = $adb->query_result($fieldListResult,$i,"displaytype");
+		$fieldlabel = $adb->query_result($fieldListResult,$i,"fieldlabel");
                 $mandatory = '';
 		$readonly = '';
-                if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 20 || $uitype == 53 || $displaytype == 3)
+                if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 20 || $uitype == 53 || $displaytype == 3 || ($displaytype != 3 && $fieldlabel == "Activity Type" && $uitype == 15))
                 {
                         $mandatory = '<font color="red">*</font>';
 						$readonly = 'disabled';
                 }
 
-		$fieldlabel = $adb->query_result($fieldListResult,$i,"fieldlabel");
 		if($lang_strings[$fieldlabel] !='')
 			$standCustFld []= $mandatory.' '.$lang_strings[$fieldlabel];
 		else

Modified: vtigercrm/branches/5.0.3/modules/Settings/UpdateDefaultFieldLevelAccess.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/UpdateDefaultFieldLevelAccess.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/UpdateDefaultFieldLevelAccess.php Wed May 23 04:47:20 2007
@@ -16,7 +16,6 @@
 
 
 $field_module=getFieldModuleAccessArray();
-
 foreach($field_module as $fld_module=>$fld_name)
 {
 	$fieldListResult = getDefOrgFieldList($fld_module);
@@ -37,7 +36,8 @@
 		}
 		//Updating the Mandatory vtiger_fields
 		$uitype = $adb->query_result($fieldListResult,$i,"uitype");
-		if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 53 || $displaytype == 3 || $uitype == 20)
+		$fieldname = $adb->query_result($fieldListResult,$i,"fieldname");
+		if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 53 || $displaytype == 3 || $uitype == 20 || ($displaytype != 3 && $fieldname == "activitytype" && $uitype == 15))
 		{
 			$visible_value = 0; 
 		}		

Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Wed May 23 04:47:20 2007
@@ -303,7 +303,6 @@
 
 }
 $smarty->assign("TAB_PRIV",$privileges_tab);			
-
 //utilities privileges
 
 if($mode == 'view')
@@ -476,7 +475,7 @@
 			$readonly = '';
 			$field=array();
 			
-			if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 53 || $displaytype == 3 || $uitype == 20)
+			if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 53 || $displaytype == 3 || $uitype == 20 || ($fldLabel == "Activity Type" && $displaytype != 3 && $uitype == 15))
 			{
 				$mandatory = '<font color="red">*</font>';
 				$readonly = 'disabled';
@@ -529,7 +528,7 @@
 				$field=array();
 
 				
-				if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 53 || $displaytype == 3 || $uitype == 20)
+				if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 53 || $displaytype == 3 || $uitype == 20 || ($fldLabel == "Activity Type" && $displaytype != 3 && $uitype == 15))
 				{
 					$mandatory = '<font color="red">*</font>';
 					$readonly = 'disabled';
@@ -579,7 +578,7 @@
 				$field=array();
 
 				
-				if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 53 || $displaytype == 3 || $uitype == 20)
+				if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 53 || $displaytype == 3 || $uitype == 20 || ($fldLabel == "Activity Type" && $displaytype != 3 && $uitype == 15))
 				{
 					$mandatory = '<font color="red">*</font>';
 					$readonly = 'disabled';

Modified: vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php Wed May 23 04:47:20 2007
@@ -179,7 +179,8 @@
 		//Updating the Mandatory vtiger_fields
 		$uitype = $adb->query_result($fieldListResult,$i,"uitype");
 		$displaytype =  $adb->query_result($fieldListResult,$i,"displaytype");
-		if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 53 || $displaytype == 3 || $uitype == 20)
+		$fieldname =  $adb->query_result($fieldListResult,$i,"fieldname");
+		if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 53 || $displaytype == 3 || $uitype == 20 || ($displaytype != 3 && $fieldname == "activitytype" && $uitype == 15))
 		{
 			$visible_value = 0;
 		}

Modified: vtigercrm/branches/5.0.3/modules/Users/UpdateProfileChanges.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/UpdateProfileChanges.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/UpdateProfileChanges.php Wed May 23 04:47:20 2007
@@ -163,7 +163,8 @@
 		//Updating the Mandatory vtiger_fields
 		$uitype = $adb->query_result($fieldListResult,$i,"uitype");
 		$displaytype =  $adb->query_result($fieldListResult,$i,"displaytype");
-		if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 53 || $displaytype == 3 || $uitype == 20)
+		$fieldname =  $adb->query_result($fieldListResult,$i,"fieldname");
+		if($uitype == 2 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16 || $uitype == 53 || $displaytype == 3 || $uitype == 20 || ($displaytype != 3 && $fieldname == "activitytype" && $uitype == 15))
 		{
 			$visible_value = 0;
 		}