[Vtigercrm-commits] [vtiger-commits] r4283 - in /vtigercrm/trunk: Smarty/templates/ modules/Users/

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Fri Mar 17 06:45:11 2006
New Revision: 4283

Log:
ui fixes has been made and Roledetailview added

Added:
    vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl   (with props)
Modified:
    vtigercrm/trunk/Smarty/templates/EditProfile.tpl
    vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl
    vtigercrm/trunk/Smarty/templates/UserProfile.tpl
    vtigercrm/trunk/modules/Users/RoleDetailView.php
    vtigercrm/trunk/modules/Users/SaveProfile.php
    vtigercrm/trunk/modules/Users/UpdateProfileChanges.php
    vtigercrm/trunk/modules/Users/profilePrivileges.php

Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Fri Mar 17 06:45:11 2006
@@ -39,6 +39,7 @@
 	<input type="hidden" name="profileid" value="{$PROFILEID}">
 	<input type="hidden" name="profile_name" value="{$PROFILE_NAME}">
 	<input type="hidden" name="profile_description" value="{$PROFILE_DESCRIPTION}">	
+	<input type="hidden" name="return_action" value="{$RETURN_ACTION}">	
 	
 	<table border="0" cellspacing="0" cellpadding=	"0" width="100%" class="prvPrfOutline">
 	<tr>
@@ -406,7 +407,11 @@
 	<tr><td colspan="2">&nbsp;</td></tr>
 	<tr>
 	<td colspan="2" align="center">
+	{if $ACTION eq 'SaveProfile'}
+	<input type="submit" value=" Finish " name="save"/>&nbsp;&nbsp;
+	{else}
 	<input type="submit" value=" Save " name="save"/>&nbsp;&nbsp;
+	{/if}
 	<input type="button" value=" Cancel " name="Cancel" onClick="window.history.back();"/>
 
 	</td>

Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Fri Mar 17 06:45:11 2006
@@ -35,6 +35,7 @@
 	<form action="index.php" method="post" name="new" id="form">
 	<input type="hidden" name="module" value="Users">		
 	<input type="hidden" name="action" value="profilePrivileges">		
+	<input type="hidden" name="return_action" value="profilePrivileges">		
 	<input type="hidden" name="mode" value="edit">	
 	<input type="hidden" name="profileid" value="{$PROFILEID}">	
 	

Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Fri Mar 17 06:45:11 2006
@@ -37,8 +37,12 @@
 		<tr class="{cycle values="dvtCellInfo,dvtCellLabel"}">
 		<td nowrap>&nbsp;
 		{if $LIST_ENTRIES[entries].del_permission eq 'yes'}
-		<a href="index.php?module=Users&action=ProfileDeleteStep1&profileid={$LIST_ENTRIES[entries].profileid}"><img src="{$IMAGE_PATH}del.gif" border="0" height="15" width="15"></a><a href="index.php?module=Users&action=profilePrivileges&mode=edit&profileid={$LIST_ENTRIES[entries].profileid}"><img src="{$IMAGE_PATH}edit.gif" alt="Edit" title="Edit" border="0"></a>
+		<a href="index.php?module=Users&action=ProfileDeleteStep1&profileid={$LIST_ENTRIES[entries].profileid}"><img src="{$IMAGE_PATH}del.gif" border="0" height="15" width="15"></a>
+		{else}
+		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 		{/if}
+		
+		<a href="index.php?module=Users&action=profilePrivileges&return_action=ListProfiles&mode=edit&profileid={$LIST_ENTRIES[entries].profileid}"><img src="{$IMAGE_PATH}edit.gif" alt="Edit" title="Edit" border="0"></a>
 		&nbsp;</td>
 		<td nowrap><a href="index.php?module=Users&action=profilePrivileges&mode=view&profileid={$LIST_ENTRIES[entries].profileid}">{$LIST_ENTRIES[entries].profilename}</a></td>
 		<td nowrap>{$LIST_ENTRIES[entries].description}&nbsp;</td>

Modified: vtigercrm/trunk/modules/Users/RoleDetailView.php
==============================================================================
Binary files - no diff available.

Modified: vtigercrm/trunk/modules/Users/SaveProfile.php
==============================================================================
Binary files - no diff available.

Modified: vtigercrm/trunk/modules/Users/UpdateProfileChanges.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UpdateProfileChanges.php (original)
+++ vtigercrm/trunk/modules/Users/UpdateProfileChanges.php Fri Mar 17 06:45:11 2006
@@ -14,6 +14,11 @@
 require_once('include/utils/utils.php');
 global $adb;
 $profileid = $_REQUEST['profileid'];
+
+if(isset($_REQUEST['return_action']) && $_REQUEST['return_action']!= '')
+	$return_action =$_REQUEST['return_action'];
+else
+	$return_action = 'ListProfiles';
 
 //Retreiving the tabs permission array
 $tab_perr_result = $adb->query("select * from profile2tab where profileid=".$profileid);
@@ -183,7 +188,7 @@
 
 	}
 }
-	$loc = "Location: index.php?action=profilePrivileges&module=Users&mode=view&profileid=".$profileid;
+	$loc = "Location: index.php?action=".$return_action."&module=Users&mode=view&profileid=".$profileid;
 	header($loc);
 
 function getPermissionValue($req_per)

Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php
==============================================================================
--- vtigercrm/trunk/modules/Users/profilePrivileges.php (original)
+++ vtigercrm/trunk/modules/Users/profilePrivileges.php Fri Mar 17 06:45:11 2006
@@ -11,7 +11,6 @@
 $image_path=$theme_path."images/";
 $profileId=$_REQUEST['profileid'];
 $profileName='';
-
 $parentProfileId=$_REQUEST['parentprofile'];
 if($_REQUEST['mode'] =='create' && $_REQUEST['radiobutton'] != 'baseprofile')
 	$parentProfileId = '';
@@ -27,6 +26,9 @@
 $smarty->assign("MOD", return_module_language($current_language,'Settings'));
 $smarty->assign("APP", $app_strings);
 $smarty->assign("CMOD", $mod_strings);
+if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != '')
+	$smarty->assign("RETURN_ACTION", $_REQUEST['return_action']);
+
 
 if(isset($_REQUEST['profile_name']) && $_REQUEST['profile_name'] != '' && $_REQUEST['mode'] == 'create')
 {	
@@ -390,7 +392,7 @@
 	next($modArr);
 }
 $smarty->assign("PRI_FIELD_LIST",$privilege_fld);	
-
+$smarty->assign("MODE",$mode);
 if($mode=='view')
 {
 	$fieldListResult = getProfile2AllFieldList($modArr,$profileId);