pari: branch 2.0 r3765 - /branches/2.0/config/js/pbx.js

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Fri Sep  5 11:39:06 2008
New Revision: 3765

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

Fix for AA50-2255 --> Users not being assigned DialPlans (GUI fix) during upgrade process



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

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=3765&r1=3764&r2=3765
==============================================================================
--- branches/2.0/config/js/pbx.js (original)
+++ branches/2.0/config/js/pbx.js Fri Sep  5 11:39:06 2008
@@ -2058,6 +2058,8 @@
 		parent.ASTGUI.dialog.waitWhile('Upgrading Configuration files .. ');
 
 		var sa = new listOfActions('extensions.conf') ;
+		var SU = new listOfActions('users.conf') ;
+
 		var ext_conf = config2json({ filename:'extensions.conf', usf:0 });
 	
 		if( !ext_conf.hasOwnProperty(ASTGUI.contexts.CONFERENCES) ){
@@ -2307,6 +2309,7 @@
 			}
 		}
 	
+		var USERS_CONF = config2json({ filename:'users.conf', usf:1 }) ;
 		for (var catname in ext_conf){
 			// Upgrade dialing rules and create dialplans in the new format
 			if( !ext_conf.hasOwnProperty(catname) || !catname.beginsWith('numberplan-custom-') ) continue;
@@ -2347,12 +2350,24 @@
 				ASTGUI.includeContexts.each( function( this_localContext ){
 					sa.new_action('append', DP_CONTEXT_NAME , 'include', this_localContext);
 				});
+
+				(function(){
+					// update any users with $catname as Context to $DP_CONTEXT_NAME
+					for ( usr in USERS_CONF ){
+						if( !USERS_CONF.hasOwnProperty(usr) ) continue;
+						if( USERS_CONF[usr].hasOwnProperty('context') && USERS_CONF[usr].context == catname ){
+							SU.new_action( 'update', usr , 'context', DP_CONTEXT_NAME , catname );
+						}
+					}
+				})();
 			})();
 		}
 	
 		sa.callActions( function(){
-			var u = ASTGUI.updateaValue({ file: ASTGUI.globals.configfile, context: 'general', variable: 'config_upgraded', value: 'yes' }) ;
-			top.window.location.reload();
+			SU.callActions( function(){
+				var u = ASTGUI.updateaValue({ file: ASTGUI.globals.configfile, context: 'general', variable: 'config_upgraded', value: 'yes' }) ;
+				top.window.location.reload();
+			});
 		});
 		// create new 'OutBound Calling Rules' out of numer plans
 	};