rbrindley: branch 2.0 r4696 - /branches/2.0/config/js/

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Wed Apr  1 15:06:19 2009
New Revision: 4696

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

- missed a few astgui_manage* calls in some core pages
- now using the new pbx object :-)


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

Modified: branches/2.0/config/js/astman.js
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/js/astman.js?view=diff&rev=4696&r1=4695&r2=4696
==============================================================================
--- branches/2.0/config/js/astman.js (original)
+++ branches/2.0/config/js/astman.js Wed Apr  1 15:06:19 2009
@@ -1138,14 +1138,13 @@
 		} ;
 		*/
 		// trunkname == trunkname as trunk_x 
-		//var ttype = parent.astgui_managetrunks.misc.getTrunkType(trunkname) ;
 		try{
 		var this_IP = '';
 		if(!ttype || ( ttype != 'sip' && ttype != 'iax' && ttype != 'providers' ) ){ return '--'; }
 		if( ttype == 'providers' ){
 			var uname = parent.sessionData.pbxinfo.trunks[ttype][trunkname]['username'];
 			var host = parent.sessionData.pbxinfo.trunks[ttype][trunkname]['host'];
-			ttype = parent.astgui_managetrunks.misc.getProviderTrunkType(trunkname); // find 'sip' or 'iax'
+			ttype = parent.pbx.trunks.getProviderType(trunkname); // find 'sip' or 'iax'
 			if ( ttype != 'sip' && ttype != 'iax'){
 				return '--';
 			}

Modified: branches/2.0/config/js/index.js
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/js/index.js?view=diff&rev=4696&r1=4695&r2=4696
==============================================================================
--- branches/2.0/config/js/index.js (original)
+++ branches/2.0/config/js/index.js Wed Apr  1 15:06:19 2009
@@ -372,15 +372,15 @@
 			}
 
 			try{
-				astgui_manageConferences.loadMeetMeRooms();
+				pbx.conferences.load();
 			}catch(er){
-				top.log.error('Error in astgui_manageConferences.loadMeetMeRooms()');
+				top.log.error('Error in pbx.conferences.load()');
 			}
 
 			try{
-				astgui_manageQueues.loadQueues();
+				pbx.queues.load();
 			}catch(er){
-				top.log.error('Error in astgui_manageQueues.loadQueues()');
+				top.log.error('Error in pbx.queues.load()');
 			}
 
 			try{
@@ -877,7 +877,7 @@
 	// for Example - in incoming calls, Voicemenus, RingGroups etc.
 	// this function navigates through all properties of sessionData.pbxinfo and returns an Array of Objects with all the possible destinations
 		var tmp = [] ;
-		var y = astgui_manageusers.listOfUsers();
+		var y = pbx.users.list();
 			y.each(function(user){
 				tmp.push({ optionText: 'User Extension -- ' + user , optionValue: 'Goto(default,' + user + ',1)' });
 
@@ -926,7 +926,7 @@
 				var rg_name = sessionData.pbxinfo.ringgroups[rg].NAME || rg ;
 				tmp.push({ optionText: 'Ring Group -- ' + rg_name , optionValue: 'Goto('+ rg +',s,1)' });
 			});
-		var y = astgui_managePageGroups.getPGsList();
+		var y = pbx.page_groups.list();
 			y.each(function(pge){
 				tmp.push({ optionText: 'Page Group -- ' + pge , optionValue: 'Goto('+ ASTGUI.contexts.PageGroups +','+ pge +',1)' });
 			});
@@ -970,7 +970,7 @@
 	getAllExtensions : function(){ // miscFunctions.getAllExtensions() - returns Array of all Extensions
 		var tmp = [] ;
 		try{
-			tmp = tmp.concat( astgui_manageusers.listOfUsers() );
+			tmp = tmp.concat( pbx.users.list() );
 			if( sessionData.pbxinfo['localextensions'].hasOwnProperty('VoiceMailMain') ){
 				tmp.push( ASTGUI.parseContextLine.getExten( sessionData.pbxinfo['localextensions']['VoiceMailMain'] ) ) ;
 			}
@@ -998,7 +998,7 @@
 						tmp.push( tmp_thisRg.extension );
 					}
 				} );
-			tmp = tmp.concat( astgui_managePageGroups.getPGsList() );
+			tmp = tmp.concat( pbx.page_groups.list() );
 			var tmp_LE = ASTGUI.cloneObject(sessionData.pbxinfo['localextensions']);
 			if( tmp_LE.getProperty('defaultDirectory') ){
 				tmp.push( tmp_LE.getProperty('defaultDirectory') );

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=4696&r1=4695&r2=4696
==============================================================================
--- branches/2.0/config/js/pbx2.js (original)
+++ branches/2.0/config/js/pbx2.js Wed Apr  1 15:06:19 2009
@@ -1168,8 +1168,8 @@
 		delete trunk.zapchan;
 		delete trunk.dahdichan;
 
-		name = astgui_managetrunks.misc.nextAvailableTrunk_x();
-		group = astgui_managetrunks.misc.nextAvailableGroup();
+		name = this.nextAvailTrunk();
+		group = this.nextAvailGroup();
 
 		trunk.signalling = '';
 		trunk.channel = '';
@@ -1188,7 +1188,7 @@
 		}
 
 		if (basis === 'GUIAssigned') {
-			name = astgui_managetrunks.misc.nextAvailableTrunk_x();
+			name = this.nextAvailTrunk();
 		} else if (basic === 'FromProvider') {
 			name = trunk.trunkname;
 		}