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

[vtigercrm-commits at vtiger.fosslabs.com]

Author: don
Date: Mon Apr 24 10:13:43 2006
New Revision: 5298

Log:
UI issue in Orgsharing Detail view has been fixed ticket ID 525

Modified:
    vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
    vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl
    vtigercrm/trunk/modules/Users/CreateSharingRule.php
    vtigercrm/trunk/modules/Users/DeleteSharingRule.php
    vtigercrm/trunk/modules/Users/SaveOrgSharing.php
    vtigercrm/trunk/modules/Users/SaveSharingRule.php

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Mon Apr 24 10:13:43 2006
@@ -60,8 +60,8 @@
 							<input type="hidden" name="parenttab" value="Settings">
 							<tr>
 								<td class="genHeaderSmall" height="25" valign="middle">Global Access Privileges</td>
-								<td align="right"><input class=small titlr="Recalculate"  type="submit" name="recalculate" value="Recalculate" onclick="this.form.action.value='RecalculateSharingRules'; return confirm('Recalculate Sharing Rules will calculate the sharing rules for the whole organization. This Operation will take some time. Do you want to contunue? ')"></td>	
-								<td align="right"><input class=small title="Edit" accessKey="C" type="submit" name="Edit" value={$CMOD.LBL_EDIT_PERMISSIONS}></td>
+								<td align="right"><input class=small titlr="Recalculate"  type="submit" name="recalculate" value="Recalculate" onclick="this.form.action.value='RecalculateSharingRules'; return confirm('Recalculate Sharing Rules will calculate the sharing rules for the whole organization. This Operation will take some time. Do you want to contunue? ')">	
+	&nbsp;<input class=small title="Edit" accessKey="C" type="submit" name="Edit" value={$CMOD.LBL_EDIT_PERMISSIONS}></td>
 								
 							</tr>
 							<tr><td colspan="2"></td></tr>

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl Mon Apr 24 10:13:43 2006
@@ -21,6 +21,7 @@
 	<form action="index.php" method="post" name="def_org_share" id="form">
 	<input type="hidden" name="module" value="Users">
 	<input type="hidden" name="action" value="SaveOrgSharing">
+	<input type="hidden" name="parenttab" value="Settings">
 	<tr>
 	<td class="genHeaderSmall" height="25" valign="middle">Global Access Privileges</td>
 	<td align="right"><input class="small" title="Save" accessKey="C" type="submit" name="Save" value="{$CMOD.LBL_SAVE_PERMISSIONS}"></td>

Modified: vtigercrm/trunk/modules/Users/CreateSharingRule.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateSharingRule.php (original)
+++ vtigercrm/trunk/modules/Users/CreateSharingRule.php Mon Apr 24 10:13:43 2006
@@ -100,6 +100,7 @@
 		}	
             $output.='<form name="newGroupForm" action="index.php" method="post">
                     <input type="hidden" name="module" value="Users">
+		    <input type="hidden" name="parenttab" value="Settings">	
                     <input type="hidden" name="action" value="SaveSharingRule">
                     <input type="hidden" name="sharing_module" value="'.$sharing_module.'">
                     <input type="hidden" name="shareId" value="'.$shareid.'">

Modified: vtigercrm/trunk/modules/Users/DeleteSharingRule.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DeleteSharingRule.php (original)
+++ vtigercrm/trunk/modules/Users/DeleteSharingRule.php Mon Apr 24 10:13:43 2006
@@ -13,5 +13,5 @@
 $shareid =  $_REQUEST['shareid'];
 deleteSharingRule($shareid);
 
-header("Location: index.php?module=Users&action=OrgSharingDetailView");
+header("Location: index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings");
 ?>

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

Modified: vtigercrm/trunk/modules/Users/SaveSharingRule.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveSharingRule.php (original)
+++ vtigercrm/trunk/modules/Users/SaveSharingRule.php Mon Apr 24 10:13:43 2006
@@ -58,6 +58,6 @@
 
 
 
-$loc = "Location: index.php?action=OrgSharingDetailView&module=Users";
+$loc = "Location: index.php?action=OrgSharingDetailView&module=Users&parenttab=Settings";
 header($loc);
 ?>