jlyons: branch asterisknow r284 - in /branches/asterisknow: ./
config/ config...
asterisk-gui-commits at lists.digium.com
asterisk-gui-commits at lists.digium.com
Mon Jan 22 15:08:01 MST 2007
Author: jlyons
Date: Mon Jan 22 16:08:01 2007
New Revision: 284
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=284
Log:
Merged revisions 277-283 via svnmerge from
https://origsvn.digium.com/svn/asterisk-gui/trunk
........
r277 | pari | 2007-01-22 09:04:46 -0600 (Mon, 22 Jan 2007) | 1 line
0008882: Incoming call rules table not correctly formatted immediately after adding a rule
........
r278 | pari | 2007-01-22 11:44:49 -0600 (Mon, 22 Jan 2007) | 1 line
In Incoming Calls -> All unmatched incoming calls would add both '_X.' and 's' extensions
........
r279 | pari | 2007-01-22 12:14:13 -0600 (Mon, 22 Jan 2007) | 1 line
minor fix - 0008863
........
r280 | pari | 2007-01-22 12:22:34 -0600 (Mon, 22 Jan 2007) | 1 line
changing the Service Provider password field type from 'text' to 'password'
........
r281 | pari | 2007-01-22 12:39:36 -0600 (Mon, 22 Jan 2007) | 1 line
Fix for 0008823: GUI Voicemenu does not retain keypress 'GoToMenu' events (Can't get it to hold on to a menu tree.)
........
r282 | pari | 2007-01-22 12:59:09 -0600 (Mon, 22 Jan 2007) | 1 line
fix for 0008853: many service provider - missing scrollbar
........
r283 | pari | 2007-01-22 15:21:15 -0600 (Mon, 22 Jan 2007) | 1 line
bug fix: trunk name is set to trunk_username from providers.conf ONLY IF a predefined service provider is selected
........
Modified:
branches/asterisknow/ (props changed)
branches/asterisknow/config/incoming.html
branches/asterisknow/config/menus.html
branches/asterisknow/config/numberplan.html
branches/asterisknow/config/setup/4.html
branches/asterisknow/config/setup/5.html
branches/asterisknow/config/trunks.html
Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 22 16:08:01 2007
@@ -1,1 +1,1 @@
-/trunk:1-272
+/trunk:1-283
Modified: branches/asterisknow/config/incoming.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/incoming.html?view=diff&rev=284&r1=283&r2=284
==============================================================================
--- branches/asterisknow/config/incoming.html (original)
+++ branches/asterisknow/config/incoming.html Mon Jan 22 16:08:01 2007
@@ -70,6 +70,7 @@
if ( ( t.name.substring(0,asterisk_guiTDPrefix.length) == asterisk_guiTDPrefix ) && t.names[x]=='exten' ){
//get pattern & action
var temp = t.fields[x].split(',');
+ if( temp[0] == "s" ){return false;}
didtrunks[t.name][temp[0]] = new Object();
didtrunks[t.name][temp[0]].priority = temp[1];
didtrunks[t.name][temp[0]].action = temp[2];
@@ -242,13 +243,22 @@
// create an entry under the selected trunk
// $('incomingrule') == "allunmatched" or "frompattern" , $('frompattern'), $('fromprovider'), $('toextension')
if ($('incomingrule').value == "allunmatched" ){
- var newpattern = "_X." ;
+ var newpattern = "_X." ;
+ var temp_provider = $('fromprovider').value;
+ var temp_priority = "1";
+ var temp_action = "Goto(default|" + $('toextension').value + "|1)";
+ var new_exten = newpattern + "," + temp_priority + "," + temp_action;
+ var new_exten2 = "s,1," + temp_action;
+ var uri = build_action('append', 0, temp_provider ,"exten", new_exten);
+ uri += build_action('append', 1, temp_provider ,"exten", new_exten2);
}else{
- var newpattern = $('frompattern').value ;
- }
- var temp_provider = $('fromprovider').value ;
- var temp_action = "Goto(default|" + $('toextension').value + "|1)";
- var temp_priority = "1";
+ var newpattern = $('frompattern').value ;
+ var temp_provider = $('fromprovider').value ;
+ var temp_action = "Goto(default|" + $('toextension').value + "|1)";
+ var temp_priority = "1";
+ var new_exten = newpattern + "," + temp_priority + "," + temp_action;
+ var uri = build_action('append', 0, temp_provider ,"exten", new_exten );
+ }
// check whether there is an existing entry with this pattern
if( typeof didtrunks[temp_provider][newpattern] != "undefined" ){
@@ -264,7 +274,8 @@
didtrunks[temp_provider][newpattern] = new Object();
didtrunks[temp_provider][newpattern].priority = temp_priority;
didtrunks[temp_provider][newpattern].action = temp_action ;
- addrowtotable(newpattern,temp_provider,temp_action,temp_priority) ; // a is pattern, b is DID_trunk, c is action, d is priority
+ //addrowtotable(newpattern,temp_provider,temp_action,temp_priority) ; // a is pattern, b is DID_trunk, c is action, d is priority
+ refreshtable();
$('userscontent').style.display = "none";
$('bg_transparent').style.display ='none';
},
@@ -272,8 +283,7 @@
alert("Config Error: " + t.status + ": " + t.statusText);
}
};
- var new_exten = newpattern + "," + temp_priority + "," + temp_action;
- var uri = build_action('append', 0, temp_provider ,"exten", new_exten );
+
opt.parameters="action=updateconfig&reload=yes&srcfilename=" + encodeURIComponent("extensions.conf") + "&dstfilename=" + encodeURIComponent("extensions.conf") + uri;
var tmp = new Ajax.Request("../../rawman", opt);
//
@@ -296,20 +306,34 @@
// old values before editing are - edit_pattern, edit_DIDtrunk, edit_action, edit_priority
// check for duplicate other than old
- if ($('incomingrule').value == "allunmatched" ){
- var newpattern = "_X." ;
- }else{
- var newpattern = $('frompattern').value ;
- }
+ var p = 0 ;
+ var uri = "" ;
var temp_provider = $('fromprovider').value ;
var temp_action = "Goto(default|" + $('toextension').value + "|1)";
var temp_priority = "1";
+ var tmp_old_string = edit_pattern + "," + edit_priority + "," + edit_action;
+ uri += build_action('delete', p, edit_DIDtrunk ,"exten", "", tmp_old_string); p++;
+ if(edit_pattern == "_X." ){
+ var tmp2_old_string = "s," + edit_priority + "," + edit_action ;
+ uri += build_action('delete', p, edit_DIDtrunk ,"exten", "", tmp2_old_string); p++;
+ }
+
+ if ($('incomingrule').value == "allunmatched" ){
+ var newpattern = "_X." ;
+ var new_exten = newpattern + "," + temp_priority + "," + temp_action;
+ var new_exten2 = "s," + temp_priority + "," + temp_action;
+ uri += build_action('append', p , temp_provider ,"exten", new_exten ); p++ ;
+ uri += build_action('append', p , temp_provider ,"exten", new_exten2 ); p++ ;
+ }else{
+ var newpattern = $('frompattern').value ;
+ var new_exten = newpattern + "," + temp_priority + "," + temp_action;
+ uri += build_action('append', p , temp_provider ,"exten", new_exten ); p++ ;
+ }
if( typeof didtrunks[temp_provider][newpattern] != "undefined" && ( temp_provider != edit_DIDtrunk || newpattern != edit_pattern ) ){
alert("An incoming call rule is already defined \n on this trunk for the selcted pattern !! ");
return false;
}
-
// delete old entry and add new entry
var opt = {
@@ -328,11 +352,6 @@
alert("Config Error: " + t.status + ": " + t.statusText);
}
};
- var tmp_old_string = edit_pattern + "," + edit_priority + "," + edit_action;
- var uri = build_action('delete', 0, edit_DIDtrunk ,"exten", "", tmp_old_string);
- var new_exten = newpattern + "," + temp_priority + "," + temp_action;
- uri+= build_action('append', 1, temp_provider ,"exten", new_exten );
-
opt.parameters="action=updateconfig&reload=yes&srcfilename=" + encodeURIComponent("extensions.conf") + "&dstfilename=" + encodeURIComponent("extensions.conf") + uri;
var tmp = new Ajax.Request("../../rawman", opt);
@@ -388,6 +407,10 @@
}
};
var uri = build_action('delete',0, b, "exten" ,"", tmp_match);
+ if( a == "_X." ){
+ var tmp2_match = "s," + d + "," + c ;
+ uri += build_action('delete',1,b,"exten","", tmp2_match);
+ }
opt.parameters="action=updateconfig&reload=yes&srcfilename=" + encodeURIComponent("extensions.conf") + "&dstfilename=" + encodeURIComponent("extensions.conf") + uri;
var tmp = new Ajax.Request("../../rawman", opt);
}
Modified: branches/asterisknow/config/menus.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/menus.html?view=diff&rev=284&r1=283&r2=284
==============================================================================
--- branches/asterisknow/config/menus.html (original)
+++ branches/asterisknow/config/menus.html Mon Jan 22 16:08:01 2007
@@ -134,7 +134,7 @@
var tmp = menustring.split('(');
var tmp1 = tmp[1].split('|');
for(y=0; y < $(my_field_options).options.length; y++ ){
- if( $(my_field_options).options[y].value == tmp1[1]){
+ if( $(my_field_options).options[y].value == tmp1[0]){
$(my_field_options).options[y].selected = true;
return true;
}
Modified: branches/asterisknow/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/numberplan.html?view=diff&rev=284&r1=283&r2=284
==============================================================================
--- branches/asterisknow/config/numberplan.html (original)
+++ branches/asterisknow/config/numberplan.html Mon Jan 22 16:08:01 2007
@@ -180,7 +180,7 @@
}
}
if(rules_nosp.length > 0 ){
- $('status').innerHTML = "Note: A Service Provider is not defined for the Rules <BR>" + rules_nosp ;
+ $('status').innerHTML = "Note: A Service Provider is not defined for the Rule(s) <BR>" + rules_nosp ;
$('trunks').selectedIndex = -1;
}
@@ -500,7 +500,7 @@
<TR id="define_usual" height=100>
<TD valign="top" align=right>Dialing Rules :</TD>
<TD valign="top"> If the number begins with <input id="beginswith" type='text' size=6 onChange="enablesave();" onkeyup="enablesave();"> and
- followed by <input id="followedby" type='text' size=1> digits <input type="checkbox" id="ormore" onChange="enablesave();"> or more <BR>
+ followed by <input id="followedby" type='text' size=1 onChange="enablesave();" onkeyup="enablesave();"> digits <input type="checkbox" id="ormore" onChange="enablesave();"> or more <BR>
<A href="#" onclick="ownpattern();">(define a custom pattern)</A>
</TD>
</TR>
Modified: branches/asterisknow/config/setup/4.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/4.html?view=diff&rev=284&r1=283&r2=284
==============================================================================
--- branches/asterisknow/config/setup/4.html (original)
+++ branches/asterisknow/config/setup/4.html Mon Jan 22 16:08:01 2007
@@ -692,8 +692,10 @@
<td width="120" align="center">Options</td>
</tr>
</table>
+<div style="width:500;height:225; overflow :auto;">
<table id="serviceproviderstable" cellpadding=2 cellspacing=1 border=0 align=center width=500>
</table>
+</div>
<div style="height:25px;color: #FF0000;" id='status' class="field_text9"></div>
<input type='button' id='new' value='Add Service Provider'>
</center>
@@ -745,7 +747,7 @@
<tr><td colspan='2' align='center' id='providerlogo_image'></td></tr>
<tr><td colspan='2' align='center'><div id='providerdesc' align='left' style='width:230px;height:100px; font-size:10px'></div></td></tr>
<tr><td class="field_text">Username:</td><td><input size='20' id='username' class="input8"></td></tr>
- <tr><td class="field_text">Password:</td><td><input size='20' id='secret' class="input8"></td></tr>
+ <tr><td class="field_text">Password:</td><td><input size='20' type="password" id='secret' class="input8"></td></tr>
</table>
</div>
<div id='customvoip' align="center" style='display:none' align="center">
@@ -800,7 +802,7 @@
</tr>
<tr>
<td class="field_text">Password:</td>
- <td><input type="text" id="customvoip_secret" size=14 onkeyup=" $('cancel').disabled= false;$('save').disabled= false;" class="input8"></td>
+ <td><input type="password" id="customvoip_secret" size=14 onkeyup=" $('cancel').disabled= false;$('save').disabled= false;" class="input8"></td>
</tr>
</table>
</div>
Modified: branches/asterisknow/config/setup/5.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/5.html?view=diff&rev=284&r1=283&r2=284
==============================================================================
--- branches/asterisknow/config/setup/5.html (original)
+++ branches/asterisknow/config/setup/5.html Mon Jan 22 16:08:01 2007
@@ -514,7 +514,7 @@
<TR id="define_usual" height=100>
<TD valign="top" align=right class="field_text">Dialing Rules :</TD>
<TD valign="top" class="field_text"> If the number begins with <input id="beginswith" type='text' size=6 onChange="enablesave();" onkeyup="enablesave();"> and
- followed by <input id="followedby" type='text' size=1> digits <input type="checkbox" id="ormore" onChange="enablesave();"> or more <BR>
+ followed by <input id="followedby" type='text' size=1 onChange="enablesave();" onkeyup="enablesave();"> digits <input type="checkbox" id="ormore" onChange="enablesave();"> or more <BR>
<A href="#" onclick="ownpattern();">(define a custom pattern)</A>
</TD>
</TR>
Modified: branches/asterisknow/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/trunks.html?view=diff&rev=284&r1=283&r2=284
==============================================================================
--- branches/asterisknow/config/trunks.html (original)
+++ branches/asterisknow/config/trunks.html Mon Jan 22 16:08:01 2007
@@ -198,7 +198,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 );
@@ -649,8 +649,10 @@
<td width="120" align="center">Options</td>
</tr>
</table>
+<div style="width:500;height:250; overflow :auto;">
<table id="serviceproviderstable" cellpadding=2 cellspacing=1 border=0 align=center width=500>
</table>
+</div>
<div style="height:25px;color: #FF0000;" id='status' class="field_text9"></div>
<input type='button' id='new' value='Add Service Provider'>
</center>
@@ -699,7 +701,7 @@
<tr><td colspan='2' align='center'><img id='providerlogo' style='visibility:hidden;'></td></tr>
<tr><td colspan='2' align='center'><div id='providerdesc' align='left' style='width:230px;height:100px; font-size:10px'></div></td></tr>
<tr onmouseover="show_tooltip('en', 'trunks', 3);"><td class="field_text">Username:</td><td><input size='20' id='username' class="input8"></td></tr>
- <tr onmouseover="show_tooltip('en', 'trunks', 4);"><td class="field_text">Password:</td><td><input size='20' id='secret' class="input8"></td></tr>
+ <tr onmouseover="show_tooltip('en', 'trunks', 4);"><td class="field_text">Password:</td><td><input type="password" size='20' id='secret' class="input8"></td></tr>
</table>
</div>
<div id='customvoip' align="center" style='display:none' align="center">
@@ -749,7 +751,7 @@
</tr>
<tr>
<td class="field_text">Password:</td>
- <td><input type="text" id="customvoip_secret" size=14 onkeyup=" $('cancel').disabled= false;$('save').disabled= false;" class="input8"></td>
+ <td><input type="password" id="customvoip_secret" size=14 onkeyup=" $('cancel').disabled= false;$('save').disabled= false;" class="input8"></td>
</tr>
</table>
</div>
More information about the asterisk-gui-commits
mailing list