pari: trunk r1204 - in /trunk/config: menus.html numberplan.html setup/5.html

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Tue Jul  3 15:27:25 2007
New Revision: 1204

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1204
Log:
[*] detailed alert messages for invalid RingGroup options in menus.html 

[*] Now parked calls will work correctly. All number numberplans include the parkedcalls context.
      In the future, we should make this an option to include it.


Modified:
    trunk/config/menus.html
    trunk/config/numberplan.html
    trunk/config/setup/5.html

Modified: trunk/config/menus.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/menus.html?view=diff&rev=1204&r1=1203&r2=1204
==============================================================================
--- trunk/config/menus.html (original)
+++ trunk/config/menus.html Tue Jul  3 15:27:25 2007
@@ -297,6 +297,14 @@
 	}
 
 	if( _nsa.value != "Answer" && _nsa.value != "GotoDirecotry" && _nsa.value != "Busy" && _nsa.value != "Hangup" && _nsa.value != "Congestion" && !_nsv .value ){
+		if( _nsa.value.toLowerCase() == "dialringgroup" ){
+			if(!_$('rgrp').options.length ){
+				gui_alert("No Ring Groups exist. <BR> Please create a Ring Group before selecting this option.");
+			}else{
+				gui_alert("Please select a RingGroup");
+			}
+			return;
+		}
 		gui_alert("Please enter a value for '" + _nsa.value +"'");
 		_nsv.focus();
 		return;

Modified: trunk/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/numberplan.html?view=diff&rev=1204&r1=1203&r2=1204
==============================================================================
--- trunk/config/numberplan.html (original)
+++ trunk/config/numberplan.html Tue Jul  3 15:27:25 2007
@@ -481,10 +481,12 @@
 		if( c < tmp[2] ){ break; }
 		c++ ;
 	}
-	gen = _extns.stored_config.catbyname[_extns.value];
-	temp = objcopy(gen);
-	temp.name = "numberplan-custom-" + c ;
-	temp.fieldbyname['plancomment'] = "DialPlan" + c;
+	var nnp = {};
+	nnp.name = "numberplan-custom-" + c ;
+	nnp.fieldbyname = {};
+	nnp.fieldbyname['plancomment'] = "DialPlan" + c;
+	nnp.fieldbyname['include'] = "default";
+	temp = objcopy(nnp);
 	_$('plancomment').value = "DialPlan" + c;
 	return temp;
 }
@@ -584,6 +586,7 @@
 	var uri = build_action('newcat', 0, default_planname ,"", "");
 	uri += build_action('append', 1, default_planname,"plancomment", "DialPlan1"); 
 	uri += build_action('append', 2, default_planname,"include", "default"); 
+	uri += build_action('append', 3, default_planname,"include", "parkedcalls"); 
 	makerequest('u','extensions.conf', uri, function(t){gui_feedback("Created Default DialPlan",'green'); location.reload(); }   );
 }
 

Modified: trunk/config/setup/5.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/5.html?view=diff&rev=1204&r1=1203&r2=1204
==============================================================================
--- trunk/config/setup/5.html (original)
+++ trunk/config/setup/5.html Tue Jul  3 15:27:25 2007
@@ -93,6 +93,7 @@
 	var uri = build_action('newcat', 0, default_planname ,"", "");
 	uri += build_action('append', 1, default_planname,"plancomment", "DialPlan1"); 
 	uri += build_action('append', 2, default_planname,"include", "default"); 
+	uri += build_action('append', 3, default_planname,"include", "parkedcalls");
 	var opt = {
 		method: 'get',
 		asynchronous: true,