[Vtigercrm-commits] [vtiger-commits] r10953 - in /vtigercrm/branches/5.0.3: Smarty/templates/DisplayFields.tpl Smarty/templates/UserEditView.tpl modules/Users/Forms.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: jerrydgeorge
Date: Tue May 22 05:24:45 2007
New Revision: 10953

Log:
User stauts - Empty Issue has been fixed. Fixes #3931

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl
    vtigercrm/branches/5.0.3/modules/Users/Forms.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl Tue May 22 05:24:45 2007
@@ -537,26 +537,16 @@
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
 			   {if $secondvalue eq 1 && $CURRENT_USERID != $smarty.request.record}
-			   	<select name="{$fldname}" tabindex="{$vt_tab}" class="small">
+			   	<select id="user_status" name="{$fldname}" tabindex="{$vt_tab}" class="small">
 			   {else}
-			   	<select disabled name="{$fldname}" class="small">
+			   	<select id="user_status" disabled name="{$fldname}" class="small">
 			   {/if} 
 				{foreach item=arr from=$fldvalue}
 					{foreach key=sel_value item=value from=$arr}
 						<option value="{$sel_value}" {$value}>{$sel_value}</option>
-						<!-- code added to pass Status field value, if Disabled for nonadmin -->
-						{if $value eq 'selected' && $secondvalue neq 1}
-							{assign var="user_stat" value="$sel_value"}
-						{/if}
-						<!--code ends -->
 					{/foreach}
 				{/foreach}
 			   </select>
-			<!-- code added to pass Status field value, if Disabled for nonadmin -->
-			{if $user_stat neq ''}
-				<input name="{$fldname}" type="hidden" value="{$user_stat}">
-			{/if}
-			<!--code ends -->
 			</td>
 			{elseif $uitype eq 105}
 			<td width="20%" class="dvtCellLabel" align=right>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl Tue May 22 05:24:45 2007
@@ -42,7 +42,10 @@
                         postBody: 'module=Users&action=UsersAjax&file=Save&ajax=true&dup_check=true&userName='+user_name,
                         onComplete: function(response) {ldelim}
 				if(response.responseText == 'SUCCESS')
+				{ldelim}
+					$('user_status').disabled = false;
 			                document.EditView.submit();
+				{rdelim}
        				else
 			                alert(response.responseText);
                         {rdelim}

Modified: vtigercrm/branches/5.0.3/modules/Users/Forms.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/Forms.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/Forms.php Tue May 22 05:24:45 2007
@@ -133,6 +133,7 @@
 		check_duplicate();
 	}else
 	{
+		$('user_status').disabled = false;
 		form.submit();
 	}
 }