rbrindley: branch 2.0 r4684 - in /branches/2.0/config/js: dialplans.js pbx2.js

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Wed Apr  1 08:30:43 2009
New Revision: 4684

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

- merged latest from astman_revamp branch


Modified:
    branches/2.0/config/js/dialplans.js
    branches/2.0/config/js/pbx2.js

Modified: branches/2.0/config/js/dialplans.js
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/js/dialplans.js?view=diff&rev=4684&r1=4683&r2=4684
==============================================================================
--- branches/2.0/config/js/dialplans.js (original)
+++ branches/2.0/config/js/dialplans.js Wed Apr  1 08:30:43 2009
@@ -38,7 +38,7 @@
 };
 
 var delete_DP_confirm = function(k){
-	var ul = parent.astgui_manageusers.listOfUsers();
+	var ul = parent.pbx.users.list();
 	for( var f=0 ; f < ul.length ; f++ ){
 		if( parent.sessionData.pbxinfo.users[ ul[f] ].getProperty('context') == k ){
 			ASTGUI.feedback( { msg:'Can not delete dialplan !<BR> The selected Dial Plan is in use by one or more users.', showfor:3, color:'red' } );
@@ -48,7 +48,7 @@
 
 	if( !confirm(' Delete DialPlan ' + k.withOut(ASTGUI.contexts.CallingPlanPrefix) + '?' ) ){ return; }
 	parent.ASTGUI.dialog.waitWhile(' Applying Changes ...');
-	parent.astgui_manageCallPlans.deletePlan(k);
+	parent.pbx.call_plans.remove(k);
 	var after = function(){
 		ASTGUI.feedback( { msg: 'deleted DialPlan !', showfor: 2 , color: 'blue', bgcolor: '#FFFFFF' } );
 		parent.ASTGUI.dialog.hide();
@@ -67,7 +67,7 @@
 	var dp_name = DOM_edit_dlpn_name.value;
 
 	if( isNewDP ){ // check if there is already a DialPlan by this name
-		var tmp_dps = parent.astgui_manageCallPlans.listPlans() ;
+		var tmp_dps = parent.pbx.call_plans.list() ;
 		if( tmp_dps.contains( ASTGUI.contexts.CallingPlanPrefix + dp_name ) ){
 			ASTGUI.feedback( { msg:' DialPlan name already in use ! <BR> Please choose another name.', showfor: 3, color:'red' } );
 			DOM_edit_dlpn_name.focus();
@@ -88,23 +88,23 @@
 	var add = function(){
 		if( isNewDP == false && dp_name != EDIT_DP){ // if dialplan name is changed, update any users context who have this dialplan
 			(function(){
-				var ul = parent.astgui_manageusers.listOfUsers();
+				var ul = parent.pbx.users.list();
 				ul.each(
 					function(user){
 						if( parent.sessionData.pbxinfo.users[user].context == EDIT_DP ){
 							var t = ASTGUI.contexts.CallingPlanPrefix + dp_name ;
-							parent.astgui_manageusers.editUserProperty({ user:user , property: 'context', value: t });
+							parent.pbx.users.edit(user, {context: t });
 						}
 					}
 				);
 			})();
 		}
-		parent.astgui_manageCallPlans.addPlan(dp_name, dp , after );
+		parent.pbx.call_plans.add(dp_name, dp , after );
 	};
 	if(isNewDP){
 		add();
 	}else{
-		parent.astgui_manageCallPlans.deletePlan(EDIT_DP);
+		parent.pbx.call_plans.remove(EDIT_DP);
 		setTimeout(add, 700);
 	}
 
@@ -115,7 +115,7 @@
 		_$('Edit_dialog_title').innerHTML = 'Create New DialPlan';
 		ASTGUI.domActions.unCheckAll( cr_chkbxClass );
 		ASTGUI.domActions.checkSelected( cr_chkbxClass, ASTGUI.includeContexts ) ;
-		DOM_edit_dlpn_name.value = parent.astgui_manageCallPlans.nextAvailableDP() ;
+		DOM_edit_dlpn_name.value = parent.pbx.call_plans.nextAvailable() ;
 		return ;
 	}
 
@@ -148,7 +148,7 @@
 	})();	
 
 	(function (){
-		var c = parent.astgui_manageCallPlans.listPlans() ;
+		var c = parent.pbx.call_plans.list() ;
 		c.each(function(plan){
 			var newRow = DOM_table_DialPlans_list.insertRow(-1);
 			newRow.className = ((DOM_table_DialPlans_list.rows.length)%2==1)?'odd':'even';

Modified: branches/2.0/config/js/pbx2.js
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/js/pbx2.js?view=diff&rev=4684&r1=4683&r2=4684
==============================================================================
--- branches/2.0/config/js/pbx2.js (original)
+++ branches/2.0/config/js/pbx2.js Wed Apr  1 08:30:43 2009
@@ -275,6 +275,10 @@
 	} else if (!callplan.includes) {
 		top.log.warn('pbx.call_plans.add: callplan.includes is empty.');
 		return false;
+	}
+
+	if (!name.beginsWith(ASTGUI.contexts.CallingPlanPrefix)) {
+		name = ASTGUI.contexts.CallingPlanPrefix + name;
 	}
 
 	var actions = new listOfSynActions('extensions.conf');