lathama: branch 2.0 r5156 - in /branches/2.0/config/js: meetme.js pbx2.js

[SVN commits to the Asterisk-GUI project]

Author: lathama
Date: Fri Feb 18 14:49:32 2011
New Revision: 5156

URL: http://svnview.digium.com/svn/asterisk-gui?view=rev&rev=5156
Log:
The conferences interface is empty because the session have wrong data

(closes issue #17316)
Reported by: cjacobsen
Patches: 
      conf2.diff uploaded by cjacobsen (license 1029)
      conf3.diff uploaded by cjacobsen (license 1029)
Tested by: cjacobsen


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

Modified: branches/2.0/config/js/meetme.js
URL: http://svnview.digium.com/svn/asterisk-gui/branches/2.0/config/js/meetme.js?view=diff&rev=5156&r1=5155&r2=5156
==============================================================================
--- branches/2.0/config/js/meetme.js (original)
+++ branches/2.0/config/js/meetme.js Fri Feb 18 14:49:32 2011
@@ -216,9 +216,6 @@
 
 	if( isNewBridge == false ){ // delete/update old bridge values
 		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'] ){

Modified: branches/2.0/config/js/pbx2.js
URL: http://svnview.digium.com/svn/asterisk-gui/branches/2.0/config/js/pbx2.js?view=diff&rev=5156&r1=5155&r2=5156
==============================================================================
--- branches/2.0/config/js/pbx2.js (original)
+++ branches/2.0/config/js/pbx2.js Fri Feb 18 14:49:32 2011
@@ -243,7 +243,7 @@
 		var name = line.betweenXY('=',',');
 		name = name.trim();
 
-		if(!sessionData.pbxinfo.hasOwnProperty(name)) {
+		if(!sessionData.pbxinfo.conferences.hasOwnProperty(name)) {
 			sessionData.pbxinfo.conferences[name] = new ASTGUI.customObject;
 			sessionData.pbxinfo.conferences[name]['configOptions'] = '';
 		}