pari: branch asterisknow r290 - in /branches/asterisknow: ./ config/
config/s...
asterisk-gui-commits at lists.digium.com
asterisk-gui-commits at lists.digium.com
Tue Jan 23 16:51:39 MST 2007
Author: pari
Date: Tue Jan 23 17:51:38 2007
New Revision: 290
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=290
Log:
Merged revisions 285-289 via svnmerge from
https://origsvn.digium.com/svn/asterisk-gui/trunk
........
r285 | pari | 2007-01-22 17:09:54 -0600 (Mon, 22 Jan 2007) | 1 line
fix for 0008879: System info / log doesn't filter out extraneous characters that may affect HTML formatting
........
r286 | pari | 2007-01-22 19:03:54 -0600 (Mon, 22 Jan 2007) | 1 line
Field validations for outbound calling Rules
........
r287 | pari | 2007-01-23 01:41:34 -0600 (Tue, 23 Jan 2007) | 1 line
in Commit 283 forgot to update the corresponding pahe n setup
........
r288 | pari | 2007-01-23 15:34:23 -0600 (Tue, 23 Jan 2007) | 1 line
Bug Fix: 'New Entry' is being listed in List of Service providers after firest cancel, adding a service provider
........
r289 | pari | 2007-01-23 16:27:31 -0600 (Tue, 23 Jan 2007) | 1 line
Tweak: Donot let the pattern get added as a named extension -- as Mark Dammer pointed out in http://forums.digium.com/viewtopic.php?t=12928
........
Modified:
branches/asterisknow/ (props changed)
branches/asterisknow/config/incoming.html
branches/asterisknow/config/numberplan.html
branches/asterisknow/config/setup/4.html
branches/asterisknow/config/setup/5.html
branches/asterisknow/config/sysinfo.html
branches/asterisknow/config/trunks.html
Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 23 17:51:38 2007
@@ -1,1 +1,1 @@
-/trunk:1-283
+/trunk:1-289
Modified: branches/asterisknow/config/incoming.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/incoming.html?view=diff&rev=290&r1=289&r2=290
==============================================================================
--- branches/asterisknow/config/incoming.html (original)
+++ branches/asterisknow/config/incoming.html Tue Jan 23 17:51:38 2007
@@ -238,6 +238,10 @@
alert("Please select an extension to which an incoming call should be routed to !");
$('toextension').focus();
return false;
+ }
+
+ if($('incomingrule').value == "frompattern" && $('frompattern').value.substr(0,1) != "_" ){
+ $('frompattern').value = "_" + $('frompattern').value ;
}
// create an entry under the selected trunk
@@ -304,6 +308,9 @@
return false;
}
+ if($('incomingrule').value == "frompattern" && $('frompattern').value.substr(0,1) != "_" ){
+ $('frompattern').value = "_" + $('frompattern').value ;
+ }
// old values before editing are - edit_pattern, edit_DIDtrunk, edit_action, edit_priority
// check for duplicate other than old
var p = 0 ;
Modified: branches/asterisknow/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/numberplan.html?view=diff&rev=290&r1=289&r2=290
==============================================================================
--- branches/asterisknow/config/numberplan.html (original)
+++ branches/asterisknow/config/numberplan.html Tue Jan 23 17:51:38 2007
@@ -409,6 +409,7 @@
function saverule(){
+ if ( !checkfields() ) return false;
if(isnewrule){ // add this rule to the default plan and reload the page
var newpriority=1;
if( typeof default_np_data[$('pattern').value] !="undefined" ){
@@ -449,6 +450,29 @@
function localajaxinit(){
$('message_text').innerHTML ="Saving Changes...";
parent.astmanEngine.config2list("users.conf", $('trunks'), new Array(), trunkcallbacks);
+}
+
+function checkfields(){
+ if( $('rulename').value.length == 0 ){
+ alert("Please enter a Rule Name");
+ $('rulename').focus();
+ return false;
+ }
+ if($('trunks').selectedIndex == -1){
+ alert("Please select a service provider to place this call through");
+ return false;
+ }
+ if($('define_advanced').style.display=="none" && $('beginswith').value.length==0 ){
+ alert("Please Enter the beginning pattern of the number");
+ $('beginswith').focus();
+ return false;
+ }
+ if($('define_usual').style.display=="none" && $('pattern').value.length == 0 ){
+ alert("Please Enter a custom pattern");
+ $('pattern').focus();
+ return false;
+ }
+return true;
}
</script>
<body id="foo" onload="localajaxinit()" bgcolor="EFEFEF">
Modified: branches/asterisknow/config/setup/4.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/4.html?view=diff&rev=290&r1=289&r2=290
==============================================================================
--- branches/asterisknow/config/setup/4.html (original)
+++ branches/asterisknow/config/setup/4.html Tue Jan 23 17:51:38 2007
@@ -225,7 +225,7 @@
callbacks.beforeSaving = function(){
if(isnewtrunk ==1){
provider = $('provider').stored_config.catbyname[$('provider').value];
- if( typeof provider.fieldbyname['trunk_username'] != "undefined" ){
+ if( typeof provider.fieldbyname['trunk_username'] != "undefined" && $('trunkstylevoip').checked ){
$('name').value = provider.fieldbyname['trunk_username'];
}
dids_array.push($('name').value );
@@ -542,6 +542,7 @@
$('table_one').style.display="";
for(i=0; i< $('devices').length; i++){
+ if($('devices').options[i].text != "New Entry")
addrow_totable($('devices').options[i].text, $('devices').options[i].value);
}
Modified: branches/asterisknow/config/setup/5.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/5.html?view=diff&rev=290&r1=289&r2=290
==============================================================================
--- branches/asterisknow/config/setup/5.html (original)
+++ branches/asterisknow/config/setup/5.html Tue Jan 23 17:51:38 2007
@@ -416,6 +416,7 @@
function saverule(){
+ if ( !checkfields() ) return false;
if(isnewrule){ // add this rule to the default plan and reload the page
var newpriority=1;
if( typeof default_np_data[$('pattern').value] !="undefined" ){
@@ -453,6 +454,28 @@
$('pattern').value = pattern;
}
+function checkfields(){
+ if( $('rulename').value.length == 0 ){
+ alert("Please enter a Rule Name");
+ $('rulename').focus();
+ return false;
+ }
+ if($('trunks').selectedIndex == -1){
+ alert("Please select a service provider to place this call through");
+ return false;
+ }
+ if($('define_advanced').style.display=="none" && $('beginswith').value.length==0 ){
+ alert("Please Enter the beginning pattern of the number");
+ $('beginswith').focus();
+ return false;
+ }
+ if($('define_usual').style.display=="none" && $('pattern').value.length == 0 ){
+ alert("Please Enter a custom pattern");
+ $('pattern').focus();
+ return false;
+ }
+return true;
+}
//-->
</SCRIPT>
<BODY bgcolor="#FFFFFF" onload="localinit()" topmargin=0 leftmargin=0>
Modified: branches/asterisknow/config/sysinfo.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/sysinfo.html?view=diff&rev=290&r1=289&r2=290
==============================================================================
--- branches/asterisknow/config/sysinfo.html (original)
+++ branches/asterisknow/config/sysinfo.html Tue Jan 23 17:51:38 2007
@@ -54,7 +54,7 @@
if(originalRequest.responseText.length==0){
$('todaylog').innerHTML = "No log messages found on this Day" ;
}else{
- $('todaylog').innerHTML = originalRequest.responseText;
+ $('todaylog').innerHTML = originalRequest.responseText.escapeHTML() ;
}
},
onFailure: function(t) {
Modified: branches/asterisknow/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/trunks.html?view=diff&rev=290&r1=289&r2=290
==============================================================================
--- branches/asterisknow/config/trunks.html (original)
+++ branches/asterisknow/config/trunks.html Tue Jan 23 17:51:38 2007
@@ -515,6 +515,7 @@
$('table_one').style.display="";
for(i=0; i< $('devices').length; i++){
+ if($('devices').options[i].text != "New Entry")
addrow_totable($('devices').options[i].text, $('devices').options[i].value);
}
More information about the asterisk-gui-commits
mailing list