espiceland: branch 2.0 r5130 - /branches/2.0/config/js/users.js

[SVN commits to the Asterisk-GUI project]

Author: espiceland
Date: Tue Dec  7 13:08:10 2010
New Revision: 5130

URL: http://svnview.digium.com/svn/asterisk-gui?view=rev&rev=5130
Log:
Fix issue where values for flash, rxflash, and signalling are not saved because value for dahdichan is being updated after.  Also fixes issue where macaddress equals extension number when the user is NOT a SIP user. ASTGUI-317.

Modified:
    branches/2.0/config/js/users.js

Modified: branches/2.0/config/js/users.js
URL: http://svnview.digium.com/svn/asterisk-gui/branches/2.0/config/js/users.js?view=diff&rev=5130&r1=5129&r2=5130
==============================================================================
--- branches/2.0/config/js/users.js (original)
+++ branches/2.0/config/js/users.js Tue Dec  7 13:08:10 2010
@@ -407,7 +407,7 @@
 		return;
 	}
 
-	if ( !ASTGUI.getFieldValue('edit_hasSip').isAstTrue() && ASTGUI.getFieldValue('edit_fxs') && !ASTGUI.getFieldValue('macaddress') ){
+	if ( ASTGUI.getFieldValue('edit_hasSip').isAstTrue() && !ASTGUI.getFieldValue('edit_fxs') && !ASTGUI.getFieldValue('macaddress') ){
 		ASTGUI.updateFieldToValue( 'macaddress',  ASTGUI.getFieldValue('new_ext') );
 	}else if( ASTGUI.getFieldValue('edit_hasSip').isAstTrue() ){
 		if ( !ASTGUI.validateFields(['macaddress'])) return ;
@@ -525,11 +525,11 @@
 				var tmp_rxflash = ASTGUI.getFieldValue('edit_rxflash') || '1250';
 				var sg = (parent.sessionData.PORTS_SIGNALLING.ls.contains(fs)) ? 'fxo_ls':'fxo_ks' ;
 
+				x.new_action('delete', u, top.sessionData.DahdiChannelString , '' ) ;
+				x.new_action('append', u, top.sessionData.DahdiChannelString, fs );					tmp_obj[top.sessionData.DahdiChannelString] = fs ;
 				x.new_action('update', u, 'signalling', sg) ;					tmp_obj['signalling'] = sg ;
 				x.new_action('update', u, 'flash',  tmp_flash) ;				tmp_obj['flash'] = tmp_flash ;
 				x.new_action('update', u, 'rxflash', tmp_rxflash ) ;				tmp_obj['rxflash'] = tmp_rxflash ;
-				x.new_action('delete', u, top.sessionData.DahdiChannelString , '' ) ;
-				x.new_action('append', u, top.sessionData.DahdiChannelString, fs );					tmp_obj[top.sessionData.DahdiChannelString] = fs ;
 			}else{
 				x.new_action('delete', u, top.sessionData.DahdiChannelString, '') ;					tmp_obj[top.sessionData.DahdiChannelString] = '' ;
 			}