bkruse: branch asterisknow r1558 - in /branches/asterisknow: ./ config/

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Sun Sep  9 03:44:52 2007
New Revision: 1558

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

........
r1556 | bkruse | 2007-09-09 03:44:15 -0500 (Sun, 09 Sep 2007) | 9 lines

Fixed a couple of bugs with the default
context include (once you delete a rule,
then try to highlight one, the context is
not found, and therefore errors our)
(closes issue #10525)
Thank you quitespy for sticking with me
through this, and providing feedback!
It really works now :]

........

Modified:
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/menus.html

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Sep  9 03:44:52 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1296,1316,1326,1332,1336-1338,1342,1346,1356,1362,1381,1384,1395,1399,1402,1413,1416,1426,1432,1435,1439,1442,1455,1465,1475,1478,1481,1488,1491,1494,1497,1500,1504,1507,1510,1513,1516,1520,1530,1534,1540,1544,1548,1552
+/branches/1.4:1-1296,1316,1326,1332,1336-1338,1342,1346,1356,1362,1381,1384,1395,1399,1402,1413,1416,1426,1432,1435,1439,1442,1455,1465,1475,1478,1481,1488,1491,1494,1497,1500,1504,1507,1510,1513,1516,1520,1530,1534,1540,1544,1548,1552,1556

Modified: branches/asterisknow/config/menus.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/menus.html?view=diff&rev=1558&r1=1557&r2=1558
==============================================================================
--- branches/asterisknow/config/menus.html (original)
+++ branches/asterisknow/config/menus.html Sun Sep  9 03:44:52 2007
@@ -283,6 +283,7 @@
 	var _vmv = _$('vmenus').value ;
 	var _nsa = _$('newstep_action');
 	var _nsv = _$('newstep_var') ;
+	var _combo_sel = _$('combosel_sounds');
 
 	if( !_nsa.value ){
 		gui_alert("Please select an action for this step");
@@ -290,7 +291,7 @@
 		return;
 	}
 
-	if( _nsa.value != "Answer" && _nsa.value != "GotoDirecotry" && _nsa.value != "Busy" && _nsa.value != "Hangup" && _nsa.value != "Congestion" && !_nsv.value ){
+	if( _nsa.value != "Answer" && _nsa.value != "GotoDirecotry" && _nsa.value != "Busy" && _nsa.value != "Hangup" && _nsa.value != "Congestion" && _nsa.value != "Background" && _nsa.value != "Playback" && !_nsv.value ){
 		
 		if( _nsa.value.toLowerCase() == "dialringgroup" ){
 			if(!_$('rgrp').options.length ){
@@ -330,7 +331,7 @@
 		action_string = "s,"+ newpriority+ ",DISA(" + _nsv.value + ")";
 		break;
 	case 'Background':
-		action_string = "s,"+ newpriority+ ",Background(" + _nsv.value + ")";
+		action_string = "s,"+ newpriority+ ",Background(" + _combo_sel.value + ")";
 		break;
 	case 'Busy':
 		action_string = "s,"+ newpriority+ ",Busy";
@@ -345,7 +346,7 @@
 		action_string = "s,"+ newpriority+ ",Set(TIMEOUT(response)=" + _nsv.value + ")";
 		break;
 	case 'Playback':
-		action_string = "s,"+ newpriority+ ",Playback(" + _nsv.value + ")";
+		action_string = "s,"+ newpriority+ ",Playback(" + _combo_sel.value + ")";
 		break;
 	case 'Wait':
 		action_string = "s,"+ newpriority+ ",Wait(" + _nsv.value + ")";
@@ -745,8 +746,13 @@
 	current_context = _$('vmenus').value;
 	var x, y, tmp;
 	var priority_1, priority_2, buffer;
-	
-	_$('allowexten').checked = (voicemenusdata[current_context].include == "default") ? true : false ;
+
+	if(voicemenusdata[current_context]) {	
+		_$('allowexten').checked = (voicemenusdata[current_context].include == "default") ? true : false ;
+	} else {
+		_$('allowexten').checked = false;
+	}
+		
  	//$('keypressoptions').innerHTML = "";
 	_steps.options.length =0;
 	_$('comment').value = voicemenusdata[current_context].comment;