rbrindley: branch 2.0 r4689 - in /branches/2.0/config/js: pbx2.js ringgroups.js

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Wed Apr  1 12:42:07 2009
New Revision: 4689

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

- merged latest from astman_revamp


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

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=4689&r1=4688&r2=4689
==============================================================================
--- branches/2.0/config/js/pbx2.js (original)
+++ branches/2.0/config/js/pbx2.js Wed Apr  1 12:42:07 2009
@@ -635,8 +635,7 @@
 	actions.new_action('append', name, 'exten', 's,n,' + rg.fallback);
 
 	var resp = actions.callActions();
-
-	if (!rest.contains('Response: Success')) {
+	if (!resp.contains('Response: Success')) {
 		top.log.error('pbx.ring_groups.add: error updating extensions.conf');
 		return false;
 	}

Modified: branches/2.0/config/js/ringgroups.js
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/js/ringgroups.js?view=diff&rev=4689&r1=4688&r2=4689
==============================================================================
--- branches/2.0/config/js/ringgroups.js (original)
+++ branches/2.0/config/js/ringgroups.js Wed Apr  1 12:42:07 2009
@@ -92,7 +92,7 @@
 
 	var RG_EXTEN = ASTGUI.getFieldValue( DOM_text_rgExten );
 	if( !isNewRG ){ // if editing existing ring group
-		parent.astgui_manageRingGroups.deleteRg(RG_EDITING) ;
+		parent.pbx.ring_groups.remove(RG_EDITING);
 	}else{ // if is a new ring group
 		if( parent.miscFunctions.ifExtensionAlreadyExists(RG_EXTEN) ){
 			ASTGUI.highlightField(DOM_text_rgExten , 'Extension already exists');
@@ -127,7 +127,7 @@
 		$(DOM_ringgroup_editdiv).hide();
 		window.location.reload();
 	};
-	parent.astgui_manageRingGroups.createNewRg( tmp_obj, later, RG_EDITING ) ;
+	parent.pbx.ring_groups.add(RG_EDITING, tmp_obj, later);
 };
 
 
@@ -214,7 +214,7 @@
 
 var delete_rg_confirm = function(d){
 	if (!confirm('Delete RingGroup ?')) { return; }
-	parent.astgui_manageRingGroups.deleteRg(d) ;
+	parent.pbx.ring_groups.remove(d) ;
 	ASTGUI.feedback( { msg:'Ring Group deleted', showfor:2 });
 	window.location.reload();
 };
@@ -285,7 +285,7 @@
 	loadDOMelements();
 	
 	(function (){
-		var t = parent.astgui_manageusers.listOfUsers();
+		var t = parent.pbx.users.list();
 		t.each(function(usr){	
 			if( parent.sessionData.pbxinfo['users'][usr]['hassip']  && parent.sessionData.pbxinfo['users'][usr]['hassip'] == 'yes' ){
 				listOfDialDevices.push( 'SIP/' + usr );