[Vtigercrm-commits] [vtiger-commits] r7431 - in /vtigercrm/trunk: Smarty/templates/UserDetailView.tpl include/utils/CommonUtils.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Thu Jun 22 07:55:45 2006
New Revision: 7431

Log:
Issue in non admin user detailview has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
    vtigercrm/trunk/include/utils/CommonUtils.php

Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Thu Jun 22 07:55:45 2006
@@ -38,7 +38,6 @@
 {if $CATEGORY eq 'Settings'}
 			<input type="hidden" name="modechk" value="prefview">
 {/if}
-			<input type="hidden" name="user_name" value="{$USER_NAME}">
 			<input type="hidden" name="old_password">
 			<input type="hidden" name="new_password">
 			<input type="hidden" name="return_module">

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Jun 22 07:55:45 2006
@@ -950,7 +950,7 @@
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
 	if($disp_view == "detail_view")
 	{
-		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
+		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == "Users")
 		{
 			$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in $blockid_list and vtiger_field.displaytype in (1,2) order by block,sequence";
 		}
@@ -966,7 +966,7 @@
 	{
 		if ($info_type != '')
 		{
-			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2]== 0)
+			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2]== 0 || $module == 'Users')
 			{
 				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list ." and ".$display_type_check." and info_type = '".$info_type."' order by block,sequence";
 			}
@@ -978,7 +978,7 @@
 		}
 		else
 		{
-			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
+			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == 'Users')
 			{
 				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and ".$display_type_check." order by block,sequence";
 			}