espiceland: branch 2.0 r5103 - /branches/2.0/config/js/callingrules.js

[SVN commits to the Asterisk-GUI project]

Author: espiceland
Date: Fri Oct 22 09:56:43 2010
New Revision: 5103

URL: http://svnview.digium.com/svn/asterisk-gui?view=rev&rev=5103
Log:
Fixes bug introduced in r5087 where dialplan is written wrong if using failover trunk.

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

Modified: branches/2.0/config/js/callingrules.js
URL: http://svnview.digium.com/svn/asterisk-gui/branches/2.0/config/js/callingrules.js?view=diff&rev=5103&r1=5102&r2=5103
==============================================================================
--- branches/2.0/config/js/callingrules.js (original)
+++ branches/2.0/config/js/callingrules.js Fri Oct 22 09:56:43 2010
@@ -345,16 +345,17 @@
 			Trunk_Build_str = '${FILTER(' + DOM_new_crl_tr_filter.value +',' + Trunk_Build_str + ')}' ;
 		}
 		Trunk_Build_str = ',' + t1_braces + '/' + DOM_new_crl_tr_prepend.value + Trunk_Build_str;
-		var foTrunk_Build_str = ',' ;
+		var foTrunk_Build_str = '' ;
 
 		if(DOM_new_crl_foChkbx.checked){
 			var t2_braces = (t2 == 'Skype') ? t2 : '${' + t2 + '}' ;
 			foTrunk_Build_str += '${EXTEN:' + tmp_fotr_stripx + '}' ;
-			if(DOM_new_crl_tr_filter.value != ''){
+			if(DOM_new_crl_fotr_filter.value != ''){
 				foTrunk_Build_str = '${FILTER(' + DOM_new_crl_fotr_filter.value + ',' + foTrunk_Build_str + ')}' ;
 			}
-			foTrunk_Build_str += t2_braces + '/' + DOM_new_crl_fotr_prepend.value + foTrunk_Build_str;
-		}
+			foTrunk_Build_str = t2_braces + '/' + DOM_new_crl_fotr_prepend.value + foTrunk_Build_str;
+		}
+		foTrunk_Build_str = ',' + foTrunk_Build_str;
 
 		var t1_cidarg = ( t1 == 'Skype') ? ',' : ',' + t1 ;
 		var t2_cidarg = ( t2 == 'Skype') ? ',' : ',' + t2 ;