rbrindley: branch 2.0 r4804 - in /branches/2.0/config/js: pbx2.js trunks_voip.js

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Thu May 28 09:37:13 2009
New Revision: 4804

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

- fixed an issue where the GUI would write outboundproxy when it was null
- fixed an issue where the GUI would not delete outboundproxy on edit if
  its new value was null

(closes issue #15142)
Reported by: Romik
(closes issue #15126)
Reported by: timeshell
(closes issue #14986)
Reported by: emrah


Modified:
    branches/2.0/config/js/pbx2.js
    branches/2.0/config/js/trunks_voip.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=4804&r1=4803&r2=4804
==============================================================================
--- branches/2.0/config/js/pbx2.js (original)
+++ branches/2.0/config/js/pbx2.js Thu May 28 09:37:13 2009
@@ -1284,6 +1284,7 @@
 		} else if (basis === 'FromProvider') {
 			name = trunk.trunkname;
 		}
+
 		break;
 	default:
 		break;

Modified: branches/2.0/config/js/trunks_voip.js
URL: http://svn.asterisk.org/svn-view/asterisk-gui/branches/2.0/config/js/trunks_voip.js?view=diff&rev=4804&r1=4803&r2=4804
==============================================================================
--- branches/2.0/config/js/trunks_voip.js (original)
+++ branches/2.0/config/js/trunks_voip.js Thu May 28 09:37:13 2009
@@ -236,7 +236,11 @@
 
 		var old_trunkUsername = parent.sessionData.pbxinfo.trunks[ttype][EDIT_TRUNK]['username'] ;
 
-		x.new_action('update', EDIT_TRUNK, 'outboundproxy', $('#trunk_outboundproxy').val());
+		if ($('#trunk_outboundproxy').val() !== '') {
+			x.new_action('update', EDIT_TRUNK, 'outboundproxy', $('#trunk_outboundproxy').val());
+		} else {
+			x.new_action('delete', EDIT_TRUNK, 'outboundproxy', '');
+		}
 		parent.sessionData.pbxinfo.trunks[ttype][EDIT_TRUNK]['outboundproxy'] = $('#trunk_outboundproxy').val();
 		x.new_action('update', EDIT_TRUNK , 'host', ASTGUI.getFieldValue(DOM_edit_VOIPTrunk_Hostname) );
 			parent.sessionData.pbxinfo.trunks[ttype][EDIT_TRUNK]['host'] = ASTGUI.getFieldValue(DOM_edit_VOIPTrunk_Hostname) ;