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

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Fri Jun 12 06:10:27 2009
New Revision: 4852

URL: http://svn.asterisk.org/svn-view/asterisk-gui?view=rev&rev=4852
Log:

- fixed an issue where analog trunks were caching newly saved info


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

Modified: branches/2.0/config/js/pbx2.js
URL: http://svn.asterisk.org/svn-view/asterisk-gui/branches/2.0/config/js/pbx2.js?view=diff&rev=4852&r1=4851&r2=4852
==============================================================================
--- branches/2.0/config/js/pbx2.js (original)
+++ branches/2.0/config/js/pbx2.js Fri Jun 12 06:10:27 2009
@@ -1317,18 +1317,18 @@
 	users_conf.new_action('newcat', name, '', '');
 
 	/* now, lets iterate thru and append to the trunk context! */
-	sessionData.pbxinfo.trunks[type][name] = {};
+	top.sessionData.pbxinfo.trunks[type][name] = {};
 	for (var v in trunk) {
 		if (!trunk.hasOwnProperty(v) || v === 'allow' || v === 'disallow') {
 			continue;
 		}
 
-		sessionData.pbxinfo.trunks[type][name][v] = trunk[v];
+		top.sessionData.pbxinfo.trunks[type][name][v] = trunk[v];
 		users_conf.new_action('append', name, v, trunk[v]);
 	}
-	sessionData.pbxinfo.trunks[type][name]['disallow'] = trunk['disallow'];
+	top.sessionData.pbxinfo.trunks[type][name]['disallow'] = trunk['disallow'];
 	users_conf.new_action('append', name, 'disallow', trunk['disallow']);
-	sessionData.pbxinfo.trunks[type][name]['allow'] = trunk['allow'];
+	top.sessionData.pbxinfo.trunks[type][name]['allow'] = trunk['allow'];
 	users_conf.new_action('append', name, 'allow', trunk['allow']);
 
 	if (type === 'analog') {
@@ -1369,7 +1369,7 @@
 		users_conf.new_action('delcat', name, '', '');
 		users_conf.callActions(); /* Not going to bother catching errors */
 
-		delete sessionData.pbxinfo.trunks[type][name];
+		delete top.sessionData.pbxinfo.trunks[type][name];
 		return false;
 	}
 

Modified: branches/2.0/config/js/trunks_analog.js
URL: http://svn.asterisk.org/svn-view/asterisk-gui/branches/2.0/config/js/trunks_analog.js?view=diff&rev=4852&r1=4851&r2=4852
==============================================================================
--- branches/2.0/config/js/trunks_analog.js (original)
+++ branches/2.0/config/js/trunks_analog.js Fri Jun 12 06:10:27 2009
@@ -88,6 +88,8 @@
 		ASTGUI.updateFieldToValue( _$(fld) ,  fld_value );
 	} );
 
+	ASTGUI.updateFieldToValue(_$('dummy_customCid'), '');
+	ASTGUI.updateFieldToValue( _$('dummy_callerid'), 'asreceived');
 	if (parent.sessionData.pbxinfo['trunks']['analog'][EDIT_TRUNK]['callerid'] && parent.sessionData.pbxinfo['trunks']['analog'][EDIT_TRUNK]['callerid'] != 'asreceived') {
 		ASTGUI.updateFieldToValue(_$('dummy_customCid'), parent.sessionData.pbxinfo.trunks.analog[EDIT_TRUNK].callerid);
 		ASTGUI.updateFieldToValue( _$('dummy_callerid'), 'custom');