pari: branch 2.0 r3865 - in /branches/2.0/config/js: astman.js pbx.js

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Tue Sep 23 13:31:10 2008
New Revision: 3865

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

 Fix for http://bugs.digium.com/view.php?id=13541

 Description:

       Create ring group and assign end action (e.g. go to voicemail for user) 
       and save ring group settings. After save, go to edit ring group and the end action does
       not appear (e.g. go to user voicemail), it appears to be blank in GUI. I checked the extensions.conf 
       file and the end action IS there, but does not show in GUI. This is confusing 
       because it appears the end action was not set in the GUI when it was.

       Asterisk GUI 2.0 Build 3855 





Modified:
    branches/2.0/config/js/astman.js
    branches/2.0/config/js/pbx.js

Modified: branches/2.0/config/js/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/js/astman.js?view=diff&rev=3865&r1=3864&r2=3865
==============================================================================
--- branches/2.0/config/js/astman.js (original)
+++ branches/2.0/config/js/astman.js Tue Sep 23 13:31:10 2008
@@ -1926,6 +1926,16 @@
 			if ( typeof el == 'string'){ el = _$(el) ; }
 			el.selectedIndex = -1;
 			if(!dest){return;}
+
+			if( dest.contains('(') && ( dest.contains(',') || dest.contains('|') ) ){
+				ASTGUI.selectbox.selectOption(el , dest);
+				return;
+			}
+
+			if( !dest.contains('(') && !dest.contains(',') && !dest.contains('|') ) {
+				ASTGUI.selectbox.selectOption(el , dest);
+				return;
+			}
 
 			if(dest.contains('(')){
 				var tmp = dest.beforeChar('(');

Modified: branches/2.0/config/js/pbx.js
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/js/pbx.js?view=diff&rev=3865&r1=3864&r2=3865
==============================================================================
--- branches/2.0/config/js/pbx.js (original)
+++ branches/2.0/config/js/pbx.js Tue Sep 23 13:31:10 2008
@@ -1652,8 +1652,8 @@
 
 		rg.strategy = (dialcount > 1) ? 'ringinorder':'ringall' ;
 		var lastline = cxt[cxt.length -1].toLowerCase();
-		if(! lastline.contains('dial(') && lastline.beginsWith('exten=s,n') ){
-			rg.fallback = lastline.split('=s,n,')[1] ;
+		if( (!lastline.contains('dial(')) && lastline.beginsWith('exten=s,n') ){
+			rg.fallback = cxt[cxt.length -1].split('=s,n,')[1] ;
 		}
 
 		for(var u=0, v = rgextns.length; u < v ; u++ ){