[Vtigercrm-commits] [vtiger-commits] r7088 - in /vtigercrm/trunk/include/utils: CommonUtils.php DetailViewUtils.php EditViewUtils.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Wed Jun 14 07:43:50 2006
New Revision: 7088

Log:
Issues in Users UI types has been fixed

Modified:
    vtigercrm/trunk/include/utils/CommonUtils.php
    vtigercrm/trunk/include/utils/DetailViewUtils.php
    vtigercrm/trunk/include/utils/EditViewUtils.php

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Wed Jun 14 07:43:50 2006
@@ -245,7 +245,7 @@
 	global $log;
 	$log->debug("Entering getCurrencyName(".$currencyid.") method ...");
         global $adb;
-        $sql1 = "select * from currency_info where id=".$currencyid;
+        $sql1 = "select * from vtiger_currency_info where id=".$currencyid;
         $result = $adb->query($sql1);
         $currencyname = $adb->query_result($result,0,"currency_name");
         $curr_symbol = $adb->query_result($result,0,"currency_symbol");

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Wed Jun 14 07:43:50 2006
@@ -55,12 +55,15 @@
 
         if($col_fields[$fieldname]=='--None--')
                 $col_fields[$fieldname]='';
-	
-	if($uitype == 13)
+	if($uitype == 116)
+	{
+		$label_fld[] = $mod_strings[$fieldlabel];
+                $label_fld[] = getCurrencyName($col_fields[$fieldname]);
+	}	
+	elseif($uitype == 13 || $uitype == 115)
 	{
 		$label_fld[] = $mod_strings[$fieldlabel];
 		$label_fld[] = $col_fields[$fieldname];
-		//$label_fld[] = '<a href="mailto:'.$col_fields[$fieldname].'">'.$col_fields[$fieldname].'</a>';
 	}
 	elseif($uitype == 15 || $uitype == 16)
 	{
@@ -808,6 +811,13 @@
                         $reminder_str= $rem_days.'&nbsp;'.$mod_strings['LBL_DAYS'].'&nbsp;'.$rem_hrs.'&nbsp;'.$mod_strings['LBL_HOURS'].'&nbsp;'.$rem_min.'&nbsp;'.$mod_strings['LBL_MINUTES'].'&nbsp;&nbsp;'.$mod_strings['LBL_BEFORE_EVENT'];
                 }
 		$label_fld[] = '&nbsp;'.$reminder_str;
+	}elseif($uitype == 98)
+	{
+	 	$label_fld[] =$mod_strings[$fieldlabel];
+		if(is_admin($current_user))
+			$label_fld[] = '<a href="index.php?module=Users&action=RoleDetailView&roldeid='.$col_fields[$fieldname].'">'.getRoleName($col_fields[$fieldname]).'</a>';
+		else
+			$label_fld[] = getRoleName($col_fields[$fieldname]);
 	}
 	else
 	{

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Wed Jun 14 07:43:50 2006
@@ -435,6 +435,12 @@
 		$editview_label[]=$mod_strings[$fieldlabel];
 		$date_format = parse_calendardate($app_strings['NTC_DATE_FORMAT']);
 		$fieldvalue[] = $value;
+	}
+	elseif($uitype == 156)
+	{
+		$editview_label[]=$mod_strings[$fieldlabel];
+		$fieldvalue[] = $value;	
+		$fieldvalue[] = $is_admin;
 	}
 	elseif($uitype == 56)
 	{
@@ -1015,7 +1021,7 @@
 	elseif($uitype == 115)
 	{
 		$editview_label[]=$mod_strings[$fieldlabel];
-		$pick_query="select * from ".$fieldname;
+		$pick_query="select * from vtiger_".$fieldname;
 		$pickListResult = $adb->query($pick_query);
 		$noofpickrows = $adb->num_rows($pickListResult);
 
@@ -1038,11 +1044,12 @@
 			$options[] = array($pickListValue=>$chk_val );	
 		}
 		$fieldvalue [] = $options;
+		$fieldvalue [] = $is_admin;
 	}
 	elseif($uitype == 116)
 	{
 		$editview_label[]=$mod_strings[$fieldlabel];
-		$pick_query="select * from currency_info";
+		$pick_query="select * from vtiger_currency_info";
 		$pickListResult = $adb->query($pick_query);
 		$noofpickrows = $adb->num_rows($pickListResult);
 
@@ -1065,12 +1072,14 @@
 			$options[$currency_id] = array($pickListValue=>$chk_val );	
 		}
 		$fieldvalue [] = $options;
+		$fieldvalue [] = $is_admin;
 	}
 	elseif($uitype ==98)
 	{
 		$editview_label[]=$mod_strings[$fieldlabel];
 		$fieldvalue[]=$value;
-        $fieldvalue[]=getRoleName($value);
+        	$fieldvalue[]=getRoleName($value);
+		$fieldvalue[]=$is_admin;
 	}
 	elseif($uitype == 105)
 	{