rbrindley: branch 2.0 r4680 - /branches/2.0/config/js/callingrules.js

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Mon Mar 30 15:37:20 2009
New Revision: 4680

URL: http://svn.digium.com/svn-view/asterisk-gui?view=rev&rev=4680
Log:

- fixed two bugs with outbound calling rules
- (1) editing a rule with a failover trunk, cancelling, and then editing a different rule w/o a failover trunk still used the 1st rule's failover trunk
- (2) in scenario one, when saving the 2nd rule it also added the 1st rule's failover trunk to extensions.conf 


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

Modified: branches/2.0/config/js/callingrules.js
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/js/callingrules.js?view=diff&rev=4680&r1=4679&r2=4680
==============================================================================
--- branches/2.0/config/js/callingrules.js (original)
+++ branches/2.0/config/js/callingrules.js Mon Mar 30 15:37:20 2009
@@ -68,6 +68,8 @@
 			ASTGUI.selectbox.selectOption(DOM_new_crl_fotrunk, tmp_cr.secondTrunk );
 			DOM_new_crl_fotr_stripx.value = tmp_cr.stripdigits_secondTrunk ;
 			DOM_new_crl_fotr_prepend.value = tmp_cr.secondPrepend ;
+		} else {
+			DOM_new_crl_foChkbx.checked = false;
 		}
 		en_db_fofields();
 	}
@@ -306,7 +308,7 @@
 		}
 	}else{
 		var t1 = ASTGUI.getFieldValue(DOM_new_crl_trunk);
-		var t2 = ASTGUI.getFieldValue(DOM_new_crl_fotrunk);
+		var t2 = (DOM_new_crl_foChkbx.checked) ? ASTGUI.getFieldValue(DOM_new_crl_fotrunk) : '';
 		if( _$('new_crl_foChkbx').checked && t1 == t2 ){
 			ASTGUI.feedback( { msg:'Failover trunk can not be same as the primary trunk !', showfor: 3, color:'red' });
 			DOM_new_crl_fotrunk.focus();