[Vtigercrm-commits] [vtiger-commits] r9946 - in /vtigercrm/branches/5.0.3: include/utils/DetailViewUtils.php include/utils/ListViewUtils.php include/utils/UserInfoUtil.php modules/Settings/language/en_us.lang.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Thu Dec  7 08:04:25 2006
New Revision: 9946

Log:
Roles moved to settings- issues fixed

Modified:
    vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php
    vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
    vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php
    vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Thu Dec  7 08:04:25 2006
@@ -931,7 +931,7 @@
 	{
 	 	$label_fld[] =$mod_strings[$fieldlabel];
 		if(is_admin($current_user))
-			$label_fld[] = '<a href="index.php?module=Users&action=RoleDetailView&roleid='.$col_fields[$fieldname].'">'.getRoleName($col_fields[$fieldname]).'</a>';
+			$label_fld[] = '<a href="index.php?module=Settings&action=RoleDetailView&roleid='.$col_fields[$fieldname].'">'.getRoleName($col_fields[$fieldname]).'</a>';
 		else
 			$label_fld[] = getRoleName($col_fields[$fieldname]);
 	}elseif($uitype == 85) //Added for Skype by Minnie

Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Thu Dec  7 08:04:25 2006
@@ -1299,7 +1299,7 @@
         }
 	elseif($uitype == 98)
 	{
-		$value = '<a href="index.php?action=RoleDetailView&module=Users&parenttab=Settings&roleid='.$temp_val.'">'.getRoleName($temp_val).'</a>';  
+		$value = '<a href="index.php?action=RoleDetailView&module=Settings&parenttab=Settings&roleid='.$temp_val.'">'.getRoleName($temp_val).'</a>';  
 	}
 	else
 	{

Modified: vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/UserInfoUtil.php Thu Dec  7 08:04:25 2006
@@ -3794,12 +3794,12 @@
 	elseif($entityType == 'roles')
 	{
 		$roleName=getRoleName($entityid);	
-		$display_out = "<a href='index.php?module=Users&action=RoleDetailView&returnaction=OrgSharingDetailView&roleid=".$entityid."'>Role::".$roleName. "</a>";			
+		$display_out = "<a href='index.php?module=Settings&action=RoleDetailView&returnaction=OrgSharingDetailView&roleid=".$entityid."'>Role::".$roleName. "</a>";			
 	}
 	elseif($entityType == 'rs')
 	{
 		$roleName=getRoleName($entityid);	
-		$display_out = "<a href='index.php?module=Users&action=RoleDetailView&returnaction=OrgSharingDetailView&roleid=".$entityid."'>RoleAndSubordinate::".$roleName. "</a>";			
+		$display_out = "<a href='index.php?module=Settings&action=RoleDetailView&returnaction=OrgSharingDetailView&roleid=".$entityid."'>RoleAndSubordinate::".$roleName. "</a>";			
 	}
 	$log->debug("Exiting getEntityDisplayLink method ...");
 	return $display_out;

Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Thu Dec  7 08:04:25 2006
@@ -693,6 +693,8 @@
 'LBL_DELETE_ROLE'=>'Delete Role',
 'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted',
 'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
+'LBL_ASSOCIATED_PROFILES'=>'Associated Profiles :',
+'LBL_ASSOCIATED_USERS'=>'Associated Users :',
 );