pari: branch 2.0 r4477 - /branches/2.0/config/js/meetme.js

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Mon Jan 26 17:27:29 2009
New Revision: 4477

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

 Fix for ABE-1770 - Deleting one conference extension removes them all.

 Can not beleive it was reported by ABE customer first and no one from the
 community noticed this for so long. Anyway, it is fixed now :-)



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

Modified: branches/2.0/config/js/meetme.js
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/js/meetme.js?view=diff&rev=4477&r1=4476&r2=4477
==============================================================================
--- branches/2.0/config/js/meetme.js (original)
+++ branches/2.0/config/js/meetme.js Mon Jan 26 17:27:29 2009
@@ -89,11 +89,17 @@
 var delete_meetMe_confirm = function(room){
 	if(!confirm("Delete Conference Bridge "+ room + " ?")) { return true; }
 	var u = new listOfSynActions('extensions.conf') ;
-		u.new_action('delete', ASTGUI.contexts.CONFERENCES, 'exten', '', parent.sessionData.pbxinfo.conferences[room]['configOptions'] );
-		u.new_action('delete', ASTGUI.contexts.CONFERENCES, 'exten', '', parent.sessionData.pbxinfo.conferences[room]['adminOptions'] );
+		if( parent.sessionData.pbxinfo.conferences[room]['configOptions'] ){
+			u.new_action('delete', ASTGUI.contexts.CONFERENCES, 'exten', '', parent.sessionData.pbxinfo.conferences[room]['configOptions'] );
+		}
+		if( parent.sessionData.pbxinfo.conferences[room]['adminOptions'] ){
+			u.new_action('delete', ASTGUI.contexts.CONFERENCES, 'exten', '', parent.sessionData.pbxinfo.conferences[room]['adminOptions'] );
+		}
 		u.callActions();
 	u.clearActions('meetme.conf'); // flush u and point to a different file
-		u.new_action('delete', 'rooms', 'conf', '', parent.sessionData.pbxinfo.conferences[room]['pwdString'] );
+		if( parent.sessionData.pbxinfo.conferences[room]['pwdString'] ){
+			u.new_action('delete', 'rooms', 'conf', '', parent.sessionData.pbxinfo.conferences[room]['pwdString'] );
+		}
 		u.callActions();
 	delete parent.sessionData.pbxinfo.conferences[room] ;
 	ASTGUI.feedback( { msg:"'Conference Bridge' deleted", showfor: 3, color:'red', bgcolor:'#FFFFFF' } );
@@ -207,12 +213,20 @@
 	var new_passString = DOM_edit_Ext.value + ',' + DOM_edit_PinCode.value + ',' + DOM_edit_AdminPinCode.value ;
 
 	if( isNewBridge == false ){ // delete/update old bridge values
-		u.new_action('delete', 'default', 'exten', '', parent.sessionData.pbxinfo.conferences[EDIT_BRIDGE]['configOptions'] ); // backward compatibility  with old gui
-		u.new_action('delete', ASTGUI.contexts.CONFERENCES, 'exten', '', parent.sessionData.pbxinfo.conferences[EDIT_BRIDGE]['configOptions'] );
-		u.new_action('delete', ASTGUI.contexts.CONFERENCES, 'exten', '', parent.sessionData.pbxinfo.conferences[EDIT_BRIDGE]['adminOptions'] );
+		if( parent.sessionData.pbxinfo.conferences[EDIT_BRIDGE]['configOptions'] ){
+			u.new_action('delete', 'default', 'exten', '', parent.sessionData.pbxinfo.conferences[EDIT_BRIDGE]['configOptions'] ); // backward compatibility  with old gui
+		}
+		if( parent.sessionData.pbxinfo.conferences[EDIT_BRIDGE]['configOptions'] ){
+			u.new_action('delete', ASTGUI.contexts.CONFERENCES, 'exten', '', parent.sessionData.pbxinfo.conferences[EDIT_BRIDGE]['configOptions'] );
+		}
+		if( parent.sessionData.pbxinfo.conferences[EDIT_BRIDGE]['adminOptions'] ){
+			u.new_action('delete', ASTGUI.contexts.CONFERENCES, 'exten', '', parent.sessionData.pbxinfo.conferences[EDIT_BRIDGE]['adminOptions'] );
+		}
 		u.callActions();
 		u.clearActions();
-		w.new_action('delete', 'rooms', 'conf', '', parent.sessionData.pbxinfo.conferences[EDIT_BRIDGE]['pwdString'] );
+		if( parent.sessionData.pbxinfo.conferences[EDIT_BRIDGE]['pwdString'] ){
+			w.new_action('delete', 'rooms', 'conf', '', parent.sessionData.pbxinfo.conferences[EDIT_BRIDGE]['pwdString'] );
+		}
 		w.callActions();
 		w.clearActions();
 		parent.sessionData.pbxinfo.conferences[EDIT_BRIDGE]['configOptions'] = new_MeetmeString ;