rbrindley: branch 2.0 r4864 - /branches/2.0/config/js/pbx.js

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Mon Jun 15 08:48:16 2009
New Revision: 4864

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

- fixed a potential issue returning early when applying zap
- listofSynActions -> listOfSynActions
- moved callActions out of the for loop


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

Modified: branches/2.0/config/js/pbx.js
URL: http://svn.asterisk.org/svn-view/asterisk-gui/branches/2.0/config/js/pbx.js?view=diff&rev=4864&r1=4863&r2=4864
==============================================================================
--- branches/2.0/config/js/pbx.js (original)
+++ branches/2.0/config/js/pbx.js Mon Jun 15 08:48:16 2009
@@ -248,13 +248,12 @@
 					if (result.contains('Response: Error')) {
 						top.log.error('Error trying to updating applyzap.conf with echocanceller info.');
 						top.log.error(result);
-						return false;
+					} else {
+						/* copy applyzap.conf to /etc/dahdi/system.conf */
+						ASTGUI.systemCmd(sessionData.directories.script_generateZaptel + ' applysettings', function() {
+								ASTGUI.dialog.alertmsg('Changes to your hardware configs has been made. <BR> Your hardware might not work properly until you reboot!');
+						});
 					}
-
-					/* copy applyzap.conf to /etc/dahdi/system.conf */
-					ASTGUI.systemCmd(sessionData.directories.script_generateZaptel + ' applysettings', function() {
-							ASTGUI.dialog.alertmsg('Changes to your hardware configs has been made. <BR> Your hardware might not work properly until you reboot!');
-					});
 				}
 			}
 		})();
@@ -499,7 +498,7 @@
 		// we should actually be using usf:0 to handle cases like 'allow', 'disallow' defined in multiple lines
 		// but for the time being we will continue with the assumption that they are all defined in one line
 		
-		var users_conf = listofSynActions('users.conf');
+		var users_conf = listOfSynActions('users.conf');
 
 		sessionData.pbxinfo['users'] = new ASTGUI.customObject ; // reset all users info
 		if(!sessionData.pbxinfo['trunks']){ sessionData.pbxinfo['trunks'] = new ASTGUI.customObject ; }
@@ -543,8 +542,6 @@
 				}
 			}
 
-			users_conf.callActions();
-
 			if( d.beginsWith('span_') && ( c[d].hasOwnProperty('zapchan') || c[d].hasOwnProperty('dahdichan') ) ){
 				sessionData.pbxinfo['trunks']['pri'][d] = c[d];
 				continue;
@@ -572,6 +569,7 @@
 				continue;
 			}
 		}}
+		users_conf.callActions();
 	}, // end of readcfg.UsersConf();
 
 	MisdnConf: function(){ // readcfg.MisdnConf();