rbrindley: branch 2.0 r4782 - /branches/2.0/config/js/astman.js

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Thu May  7 09:56:06 2009
New Revision: 4782

URL: http://svn.asterisk.org/svn-view/asterisk-gui?view=rev&rev=4782
Log:

- fixed an issue that was causing DISA in voice menus to display improperly


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

Modified: branches/2.0/config/js/astman.js
URL: http://svn.asterisk.org/svn-view/asterisk-gui/branches/2.0/config/js/astman.js?view=diff&rev=4782&r1=4781&r2=4782
==============================================================================
--- branches/2.0/config/js/astman.js (original)
+++ branches/2.0/config/js/astman.js Thu May  7 09:56:06 2009
@@ -1687,8 +1687,8 @@
 			if(x.contains(',') ){
 				return x.split(',');
 			}
-			if(x.contains(',') ){
-				return x.split(',');
+			if(x.contains('|') ){
+				return x.split('|');
 			}
 			return [x] ;
 		},
@@ -1791,7 +1791,7 @@
 				if ( args[0] && args[1] && args[0] == 'no-password' ){
 					return 'DISA using context ' + args[1] + ' (no password)';
 				}
-				return 'DISA ' + ( args[0] && ' using password ' + args[0] ) + ( args[1] && ' against context ' + args[1] ) ;
+				return 'DISA using password ' + args[0] + ' against context ' + args[1];
 			}
 
 			if( all_LC == "background" ){