bkruse: trunk r1472 - in /trunk: ./ config/trunks.html

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Tue Aug 28 18:19:16 2007
New Revision: 1472

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1472
Log:
Merged revisions 1471 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/branches/1.4

........
r1471 | bkruse | 2007-08-28 18:18:30 -0500 (Tue, 28 Aug 2007) | 6 lines

Fixed a problem so that now instead of parsing
for Custom - for the comment line, we will first
parse for that, if not found, inline the whole value.
The previous case could cause 'undefined' as the
trunk comment, as tmp[1] did not contain anything

........

Modified:
    trunk/   (props changed)
    trunk/config/trunks.html

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Tue Aug 28 18:19:16 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1291,1293,1298-1300,1326,1332,1336-1338,1342,1346,1349,1356,1359,1362,1381,1384,1395,1399,1402,1413,1416,1426,1432,1435,1439,1442,1455,1458,1465
+/branches/1.4:1-1291,1293,1298-1300,1326,1332,1336-1338,1342,1346,1349,1356,1359,1362,1381,1384,1395,1399,1402,1413,1416,1426,1432,1435,1439,1442,1455,1458,1465,1471

Modified: trunk/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/trunks.html?view=diff&rev=1472&r1=1471&r2=1472
==============================================================================
--- trunk/config/trunks.html (original)
+++ trunk/config/trunks.html Tue Aug 28 18:19:16 2007
@@ -147,8 +147,8 @@
 callbacks.postselect = function(){
 	if( _$('trunkstylecustomvoip').checked ){
 		// Custom VOIP
-		var tmp = $('trunkname').value.split("Custom - ")  ;
-		_$('customvoip_name').value = tmp[1];
+		var tmp = _$('trunkname').value.split("Custom - ")  ;
+		_$('customvoip_name').value = (tmp[1]) ? tmp[1] : (_$('trunkname').value) ? _$('trunkname').value : "No Comment/Trunk Name Set";
 		_$('customvoip_username').value = _$('username').value;
 		_$('customvoip_secret').value = _$('secret').value;
 		_$('customvoip_protocol').selectedIndex = ( _$('hassip').value  == "yes" ) ? 1 : 0;