rbrindley: branch 2.0 r4783 - in /branches/2.0/config: js/menus.js menus.html

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Thu May  7 10:49:51 2009
New Revision: 4783

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

- fixed an issue where adding a 'Dial Via Trunk' didn't 
  check for improper extension chars in the number to dial


Modified:
    branches/2.0/config/js/menus.js
    branches/2.0/config/menus.html

Modified: branches/2.0/config/js/menus.js
URL: http://svn.asterisk.org/svn-view/asterisk-gui/branches/2.0/config/js/menus.js?view=diff&rev=4783&r1=4782&r2=4783
==============================================================================
--- branches/2.0/config/js/menus.js (original)
+++ branches/2.0/config/js/menus.js Thu May  7 10:49:51 2009
@@ -436,7 +436,11 @@
 				break;
 			case 'DialViaTrunk':
 				var tmp_trunkName = ASTGUI.getFieldValue('newstep_dial_ViaTrunk');
-				newstep =  'Macro('+ ASTGUI.contexts.dialtrunks + ',${' + tmp_trunkName + '}/'+ ASTGUI.getFieldValue('newstep_dial_ThisNumber') +',,'+ tmp_trunkName + ',)' ;
+				var tmp_extern_num = ASTGUI.getFieldValue('newstep_dial_ThisNumber');
+				if (!parent.ASTGUI.validateFields([_$('newstep_dial_ThisNumber')])) {
+					return;
+				}
+				newstep =  'Macro('+ ASTGUI.contexts.dialtrunks + ',${' + tmp_trunkName + '}/'+ tmp_extern_num +',,'+ tmp_trunkName + ',)' ;
 				break;
 			case 'UserEvent':
 				var tmp_EventName = ASTGUI.getFieldValue('newstep_UserEvent_eventname');

Modified: branches/2.0/config/menus.html
URL: http://svn.asterisk.org/svn-view/asterisk-gui/branches/2.0/config/menus.html?view=diff&rev=4783&r1=4782&r2=4783
==============================================================================
--- branches/2.0/config/menus.html (original)
+++ branches/2.0/config/menus.html Thu May  7 10:49:51 2009
@@ -210,7 +210,7 @@
 						</select>
 						<input  class='class_newStep_details_td' id="newstep_custom" size=24>
 						<input  class='class_newStep_details_td' id="newstep_agi" size=16>
-						<input class='class_newStep_details_td' id="newstep_dial_ThisNumber" size=10>
+						<input class='class_newStep_details_td' id="newstep_dial_ThisNumber" size=10 validation="dialpattern" field_name="This number" required="yes">
 						<select class='class_newStep_details_td' id="newstep_dial_ViaTrunk"></select>
 						<input class='class_newStep_details_td' id="newstep_UserEvent_eventname" size=5>
 						<span  class='class_newStep_details_td' id='newstep_UserEvent_body_lbl'>Body:</span>