pari: branch pari/dahdi_support r4365 - in /team/pari/dahdi_support: ./ confi...
SVN commits to the Asterisk-GUI project
asterisk-gui-commits at lists.digium.com
Wed Dec 17 11:58:42 CST 2008
Author: pari
Date: Wed Dec 17 11:58:41 2008
New Revision: 4365
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=4365
Log:
Merged revisions 4077-4079,4081,4083,4085,4089-4090,4101,4104,4106,4111-4113,4115-4121,4123,4129-4130,4132,4134-4137,4148-4149,4151,4153,4155,4159-4160,4162,4164-4187,4195,4197-4201,4205,4211-4212,4215-4217,4219,4221-4224,4229-4230,4233-4240,4242,4244,4251-4252,4268,4270,4273,4276-4278,4281-4291,4293-4296,4301,4303-4305,4307-4308,4310,4313-4321,4334-4335,4337,4339-4364 via svnmerge from
https://origsvn.digium.com/svn/asterisk-gui/branches/2.0
........
r4345 | pari | 2008-12-11 15:56:38 -0600 (Thu, 11 Dec 2008) | 5 lines
Apply dialoptions to ringgroups aswell.
........
r4351 | pari | 2008-12-15 14:35:14 -0600 (Mon, 15 Dec 2008) | 6 lines
ABE-1716 : make sure a master_clock is always set for the bri card.
If one is not specified, default to the first one.
........
r4352 | pari | 2008-12-15 14:37:55 -0600 (Mon, 15 Dec 2008) | 4 lines
bugfix: hideWithBg()
........
r4353 | pari | 2008-12-15 15:20:13 -0600 (Mon, 15 Dec 2008) | 6 lines
Fix error : 'chan[5] is undefined'
........
r4359 | pari | 2008-12-16 10:56:34 -0600 (Tue, 16 Dec 2008) | 4 lines
ABE-1751 - Can't allow G723 codec for users in GUI
........
r4360 | pari | 2008-12-16 11:13:36 -0600 (Tue, 16 Dec 2008) | 5 lines
updating hardcoded path
........
r4361 | pari | 2008-12-16 13:11:17 -0600 (Tue, 16 Dec 2008) | 6 lines
ABE-1443 : Hide Setup Hardware and mISDN Config tabs when no digital or mISDN cards are in the system
........
r4363 | pari | 2008-12-16 16:50:16 -0600 (Tue, 16 Dec 2008) | 9 lines
New feature:
new Option for 'Add new Step' in Voicemenus => Goto Destination if callerId Number matches a specified number.
........
r4364 | pari | 2008-12-16 17:36:25 -0600 (Tue, 16 Dec 2008) | 5 lines
Added a custom destination option for calling rules
........
Modified:
team/pari/dahdi_support/ (props changed)
team/pari/dahdi_support/config/callingrules.html
team/pari/dahdi_support/config/index.html
team/pari/dahdi_support/config/js/astman.js
team/pari/dahdi_support/config/js/callingrules.js
team/pari/dahdi_support/config/js/index.js
team/pari/dahdi_support/config/js/menus.js
team/pari/dahdi_support/config/js/misdn.js
team/pari/dahdi_support/config/js/pbx.js
team/pari/dahdi_support/config/js/registerg729.js
team/pari/dahdi_support/config/js/welcome2.js
team/pari/dahdi_support/config/menus.html
Propchange: team/pari/dahdi_support/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: team/pari/dahdi_support/config/callingrules.html
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/callingrules.html?view=diff&rev=4365&r1=4364&r2=4365
==============================================================================
--- team/pari/dahdi_support/config/callingrules.html (original)
+++ team/pari/dahdi_support/config/callingrules.html Wed Dec 17 11:58:41 2008
@@ -92,8 +92,14 @@
</label>
</legend>
<table width='580'>
- <TR> <TD align="right" width='40%'>Destination :</TD>
- <TD><select id='new_crl_localDest'></select></TD>
+ <TR> <TD align="right" width='40%' valign='top'>Destination :</TD>
+ <TD>
+ <select id='new_crl_localDest'></select>
+ <div id='new_crl_localDest_CUSTOM_container' style='margin-top:3px;display:none'>
+ <input id='new_crl_localDest_CUSTOM' size=30> <BR>
+ Ex: Macro(someMacro,${EXTEN:1})
+ </div>
+ </TD>
</TR>
</table>
</fieldset>
Modified: team/pari/dahdi_support/config/index.html
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/index.html?view=diff&rev=4365&r1=4364&r2=4365
==============================================================================
--- team/pari/dahdi_support/config/index.html (original)
+++ team/pari/dahdi_support/config/index.html Wed Dec 17 11:58:41 2008
@@ -60,7 +60,8 @@
'g726' : 'G.726' ,
'adpcm': 'ADPCM' ,
'lpc10': 'LPC10' ,
- 'g729' : 'G.729'
+ 'g729' : 'G.729' ,
+ 'g723' : 'G.723'
},
directories:{},// sessionData.directories
FileCache:{}, // Object to Cache config files .. sessionData.FileCache['users.conf'].content , sessionData.FileCache['users.conf'].modified
Modified: team/pari/dahdi_support/config/js/astman.js
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/js/astman.js?view=diff&rev=4365&r1=4364&r2=4365
==============================================================================
--- team/pari/dahdi_support/config/js/astman.js (original)
+++ team/pari/dahdi_support/config/js/astman.js Wed Dec 17 11:58:41 2008
@@ -1074,6 +1074,7 @@
},
getFieldValue : function(el){ // ASTGUI.getFieldValue(el)
+ if( !el ){ return ''; }
if ( typeof el == 'string'){ el = _$(el) ; }
switch(el.type){
case 'checkbox':
Modified: team/pari/dahdi_support/config/js/callingrules.js
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/js/callingrules.js?view=diff&rev=4365&r1=4364&r2=4365
==============================================================================
--- team/pari/dahdi_support/config/js/callingrules.js (original)
+++ team/pari/dahdi_support/config/js/callingrules.js Wed Dec 17 11:58:41 2008
@@ -212,11 +212,23 @@
var localajaxinit = function() {
top.document.title = "Edit Calling Rules";
- ASTGUI.selectbox.populateArray( 'new_crl_localDest' , parent.miscFunctions.getAllDestinations() );
+
+ var tmp_someArray = parent.miscFunctions.getAllDestinations() ;
+ tmp_someArray.push({ optionText: 'Custom' , optionValue: 'CUSTOM' });
+ ASTGUI.selectbox.populateArray( 'new_crl_localDest' , tmp_someArray);
ASTGUI.domActions.showHideClassByCheckBox( 'toLocalDest', 'STT_TR_OPTIONS', true );
load_DOMelements();
update_CRLSTable();
ASTGUI.events.add( 'restore_default_clrs_button', 'click' , restore_default_callingRules );
+
+ $('#new_crl_localDest').change(function(){
+ if( this.value == 'CUSTOM'){
+ $('#new_crl_localDest_CUSTOM_container').show();
+ $('#new_crl_localDest_CUSTOM').val('').focus();
+ }else{
+ $('#new_crl_localDest_CUSTOM_container').hide();
+ }
+ });
};
@@ -286,7 +298,12 @@
}
if( _$('toLocalDest').checked ){
- var as = DOM_new_crl_pattern.value + ',1,' + ASTGUI.getFieldValue('new_crl_localDest') ;
+ var tmp_new_crl_localDest = ASTGUI.getFieldValue('new_crl_localDest') ;
+ if( tmp_new_crl_localDest == 'CUSTOM' ){
+ var as = DOM_new_crl_pattern.value + ',1,' + ASTGUI.getFieldValue('new_crl_localDest_CUSTOM') ; ////// <<<<<<<<<<<<<<<<<<<
+ }else{
+ var as = DOM_new_crl_pattern.value + ',1,' + tmp_new_crl_localDest ;
+ }
}else{
var t1 = ASTGUI.getFieldValue(DOM_new_crl_trunk);
var t2 = ASTGUI.getFieldValue(DOM_new_crl_fotrunk);
Modified: team/pari/dahdi_support/config/js/index.js
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/js/index.js?view=diff&rev=4365&r1=4364&r2=4365
==============================================================================
--- team/pari/dahdi_support/config/js/index.js (original)
+++ team/pari/dahdi_support/config/js/index.js Wed Dec 17 11:58:41 2008
@@ -844,7 +844,7 @@
});
},
- getAllDestinations: function(){ // miscFunctions.getAllDestinations() // --> returns an Array of Objects
+ getAllDestinations: function(without_Goto){ // miscFunctions.getAllDestinations() // --> returns an Array of Objects
// There are various places in the gui where we want to preset a select box with all possible destinations
// for Example - in incoming calls, Voicemenus, RingGroups etc.
// this function navigates through all properties of sessionData.pbxinfo and returns an Array of Objects with all the possible destinations
@@ -920,6 +920,22 @@
tmp.push({ optionText: 'Operator' , optionValue: 'Goto(default,o,1)' });
tmp.push({ optionText: 'Hangup' , optionValue: 'Hangup' });
tmp.push({ optionText: 'Congestion' , optionValue: 'Congestion' });
+
+ if( without_Goto ){
+ var tmp_withoutGoto = [];
+ for( var t=0; t < tmp.length; t++ ){
+ if( tmp[t].optionValue.beginsWith('Goto(') ){
+
+ tmp_withoutGoto.push({
+ optionText : tmp[t].optionText ,
+ optionValue : tmp[t].optionValue.lChop('Goto(').rChop(')')
+ });
+
+ }
+ }
+ return tmp_withoutGoto;
+ }
+
return tmp;
},
Modified: team/pari/dahdi_support/config/js/menus.js
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/js/menus.js?view=diff&rev=4365&r1=4364&r2=4365
==============================================================================
--- team/pari/dahdi_support/config/js/menus.js (original)
+++ team/pari/dahdi_support/config/js/menus.js Wed Dec 17 11:58:41 2008
@@ -261,6 +261,12 @@
$('#newstep_gotoDestination').show();
tip_chosenStep.innerHTML = '';
break;
+ case 'toDestinationByCallerId':
+ lbl('Goto Destiantion if CallerId is');
+ $('#newstep_pwd').val('').show();
+ $('#newstep_gotoDestinationByCallerId').show();
+ tip_chosenStep.innerHTML = 'Goto this destination, if callerId number matches the specified number';
+ break;
case 'setLanguage':
lbl('Set Language');
$('#newstep_setlanguage').show();
@@ -397,6 +403,12 @@
break;
case 'toDestination':
newstep = ASTGUI.getFieldValue('newstep_gotoDestination');
+ break;
+ case 'toDestinationByCallerId':
+ // newstep = 'GotoIf($["${CALLERID(num)}" == "newstep_pwd"]? newstep_gotoDestinationByCallerId )'
+ newstep = "GotoIf($[\"${CALLERID(num)}\" == \""
+ + ASTGUI.getFieldValue('newstep_pwd')
+ + "\"]?"+ ASTGUI.getFieldValue('newstep_gotoDestinationByCallerId') +")" ;
break;
case 'setLanguage':
newstep = 'Set(CHANNEL(language)=' + ASTGUI.getFieldValue('newstep_setlanguage') + ')';
@@ -607,9 +619,15 @@
var updateVoiceMenus_Table = function(){
- var someArray = parent.miscFunctions.getAllDestinations() ;
- ASTGUI.selectbox.populateArray('newstep_gotoDestination', someArray);
- ASTGUI.selectbox.populateArray('kpe_destinations', someArray);
+ (function(){
+ var someArray = parent.miscFunctions.getAllDestinations() ;
+ ASTGUI.selectbox.populateArray('newstep_gotoDestination', someArray);
+
+ var someOtherArray = parent.miscFunctions.getAllDestinations(1) ;
+ ASTGUI.selectbox.populateArray('newstep_gotoDestinationByCallerId', someOtherArray);
+
+ ASTGUI.selectbox.populateArray('kpe_destinations', someArray);
+ })();
ASTGUI.selectbox.insert_before('kpe_destinations','None', '', 0);
$('#sqSteps').click(function(event){
Modified: team/pari/dahdi_support/config/js/misdn.js
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/js/misdn.js?view=diff&rev=4365&r1=4364&r2=4365
==============================================================================
--- team/pari/dahdi_support/config/js/misdn.js (original)
+++ team/pari/dahdi_support/config/js/misdn.js Wed Dec 17 11:58:41 2008
@@ -195,9 +195,8 @@
PORTS[p]['option'] = _$('editport_option').value ;
PORTS[p]['edited'] = true;
misdnConfig.showMisdnConfiginTable();
- _$('edit_port').style.display = "none";
-
- _$('misdntable_r'+p).style.background = "#C9AAAA";
+ $('#edit_port').hideWithBg();
+ // _$('misdntable_r'+p).style.background = "#C9AAAA";
}
@@ -227,12 +226,18 @@
if(PORTS[k]['portType']){ pmode_ports[PORTS[k]['portType']].push(k); }
}}
-
- for( var k in PORTS ){ if( PORTS.hasOwnProperty(k) ){
+ var tmp_optionMaster_clock ;
+ for( var k in PORTS ){ if( PORTS.hasOwnProperty(k) ){
if( PORTS[k]['option'] ){
x.new_action('append', d , 'option', k + ',' + PORTS[k]['option']);
+ if( PORTS[k]['option'] == 'master_clock' ){
+ tmp_optionMaster_clock = k;
+ }
}
}}
+ if( !tmp_optionMaster_clock ){
+ x.new_action( 'append', d , 'option', '1,master_clock' );
+ }
for( var k in pmode_ports ){ if( pmode_ports.hasOwnProperty(k) && pmode_ports[k].length ){
x.new_action('append', d , k , pmode_ports[k].join(','));
Modified: team/pari/dahdi_support/config/js/pbx.js
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/js/pbx.js?view=diff&rev=4365&r1=4364&r2=4365
==============================================================================
--- team/pari/dahdi_support/config/js/pbx.js (original)
+++ team/pari/dahdi_support/config/js/pbx.js Wed Dec 17 11:58:41 2008
@@ -536,6 +536,12 @@
sessionData.FXS_PORTS_DETECTED = [];
var y;
var c = config2json({filename: ASTGUI.globals.dahdiScanOutput , usf:0});
+ var tmp_dahdi_contexts = c.getOwnProperties();
+ if( !tmp_dahdi_contexts.length ){ // no analog or digital hardware found, hide the hardware configuration & misdn panels
+ miscFunctions.hide_panel('digital.html', 0);
+ miscFunctions.hide_panel('misdn.html', 0);
+ }
+
for( var d in c ){ if (c.hasOwnProperty(d) ) {
c[d].each( function( item ) {
if( item.beginsWith('port=') && item.contains('FXO') && !item.contains('FAILED') ){ // we are looking for item if it is in the format 'port=4,FXO'
@@ -1726,12 +1732,12 @@
if( rg.strategy == 'ringinorder' ){
rg.members.each(
function(member){
- x.new_action('append', newrg, 'exten', 's,n,Dial(' + member +',' + rg.ringtime + ',i)' );
+ x.new_action('append', newrg, 'exten', 's,n,Dial(' + member +',' + rg.ringtime + ',${DIALOPTIONS}i)' );
}
);
}else{
if(rg.members.length){
- x.new_action('append', newrg, 'exten', 's,n,Dial(' + rg.members.join('&') +',' + rg.ringtime + ',i)' );
+ x.new_action('append', newrg, 'exten', 's,n,Dial(' + rg.members.join('&') +',' + rg.ringtime + ',${DIALOPTIONS}i)' );
}
}
x.new_action( 'append', newrg, 'exten', 's,n,' + rg.fallback );
Modified: team/pari/dahdi_support/config/js/registerg729.js
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/js/registerg729.js?view=diff&rev=4365&r1=4364&r2=4365
==============================================================================
--- team/pari/dahdi_support/config/js/registerg729.js (original)
+++ team/pari/dahdi_support/config/js/registerg729.js Wed Dec 17 11:58:41 2008
@@ -23,7 +23,7 @@
var list_keyFiles = function(){
- ASTGUI.listSystemFiles( '/var/lib/asterisk/licenses/' , function(listOfFiles) {
+ ASTGUI.listSystemFiles( parent.sessionData.directories.astvarlibdir + 'licenses/' , function(listOfFiles) {
if(listOfFiles.length){
$('#div_list_keysheading').show().html( "<B>License Keys:</B> " + listOfFiles.join(', '));
}else{
Modified: team/pari/dahdi_support/config/js/welcome2.js
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/js/welcome2.js?view=diff&rev=4365&r1=4364&r2=4365
==============================================================================
--- team/pari/dahdi_support/config/js/welcome2.js (original)
+++ team/pari/dahdi_support/config/js/welcome2.js Wed Dec 17 11:58:41 2008
@@ -474,7 +474,7 @@
/* 0. Channel 1. Context 2. Extension 3. Prio 4. State
* 5. Application 6. Data 7. CallerID 8. <blank> 9. AccountCode
* 10. Duration 10. BridgedTo */
- if (chan[5].toLowerCase() != 'meetme') {
+ if ( chan.length < 6 || chan[5].toLowerCase() != 'meetme') {
continue;
}
Modified: team/pari/dahdi_support/config/menus.html
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/menus.html?view=diff&rev=4365&r1=4364&r2=4365
==============================================================================
--- team/pari/dahdi_support/config/menus.html (original)
+++ team/pari/dahdi_support/config/menus.html Wed Dec 17 11:58:41 2008
@@ -182,6 +182,7 @@
<option value="Wait">Wait</option>
<option value="WaitExten">WaitExten</option>
<option value="toDestination">Goto Destination</option>
+ <option value="toDestinationByCallerId">Goto Destination by CallerId</option>
<option value="setLanguage">Set Language</option>
<option value="GotoDirecotry">Goto Directory</option>
<option value="DialViaTrunk">Dial a Number via Trunk</option>
@@ -201,6 +202,7 @@
<select class='class_newStep_details_td' id="newstep_mohClass"></select>
<select class='class_newStep_details_td' id="newstep_disaContext"></select>
<select class='class_newStep_details_td' id="newstep_gotoDestination"></select>
+ <select class='class_newStep_details_td' id="newstep_gotoDestinationByCallerId"></select>
<select class='class_newStep_details_td' id="newstep_setlanguage">
<option value='en'>English</option>
<option value='es'>Spanish</option>
More information about the asterisk-gui-commits
mailing list