pari: branch pari/dahdi_support r4408 - in /team/pari/dahdi_support: ./ confi...

SVN commits to the Asterisk-GUI project asterisk-gui-commits at lists.digium.com
Fri Jan 9 10:44:45 CST 2009 

Author: pari
Date: Fri Jan  9 10:44:44 2009
New Revision: 4408

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=4408
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-4344,4346-4350,4354-4358,4362,4365-4369,4373-4374,4377,4380,4382-4388,4390,4392,4394-4407 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/branches/2.0

........
  r4398 | pari | 2009-01-07 14:15:49 -0600 (Wed, 07 Jan 2009) | 5 lines
  
  patch by thias - Prevent redirect not editable in ring groups
  
  (closes issue #13773)
........
  r4399 | pari | 2009-01-08 10:57:08 -0600 (Thu, 08 Jan 2009) | 3 lines
  
  updated some comments to ASTDB functions
........
  r4402 | pari | 2009-01-08 12:01:47 -0600 (Thu, 08 Jan 2009) | 6 lines
  
  
   fix: 'emptycat' action is not working in 1.6.0
        always delete each line in the context
........
  r4407 | rbrindley | 2009-01-09 10:26:18 -0600 (Fri, 09 Jan 2009) | 6 lines
  
  
  - enclosed trunkname with missing single quotation marks.
  
  (closes issue #14200)
........

Modified:
    team/pari/dahdi_support/   (props changed)
    team/pari/dahdi_support/config/js/astman.js
    team/pari/dahdi_support/config/js/pbx.js
    team/pari/dahdi_support/config/js/ringgroups.js
    team/pari/dahdi_support/config/js/trunks_analog.js
    team/pari/dahdi_support/config/ringgroups.html

Propchange: team/pari/dahdi_support/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

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=4408&r1=4407&r2=4408
==============================================================================
--- team/pari/dahdi_support/config/js/astman.js (original)
+++ team/pari/dahdi_support/config/js/astman.js Fri Jan  9 10:44:44 2009
@@ -380,8 +380,10 @@
 	},
 
 	ASTDB:{
-		updateKey : function( k ){ // ASTGUI.ASTDB.updateKey( { dbname: 'astgui', key : 'keyname', keyvalue : 'keyvalue' } );
-			// k = { dbname: 'astgui', key : 'keyname', keyvalue : 'keyvalue' } // dbname is optional, defaults to ASTGUI.globals.GUI_DB
+		updateKey : function( k ){ 
+			// ASTGUI.ASTDB.updateKey( { dbname: 'astgui', key : 'keyname', keyvalue : 'keyvalue' } );
+			// dbname is optional, defaults to ASTGUI.globals.GUI_DB
+			// 	returns true if success, false otherwise
 			if( !k.hasOwnProperty('dbname') ){
 				k.dbname = ASTGUI.globals.GUI_DB ;
 			}
@@ -391,8 +393,10 @@
 			return false;
 		},
 
-		deleteKey : function( k ){ // ASTGUI.ASTDB.deleteKey( { dbname: 'astgui', key : 'keyname' } );
-			// k = { dbname: 'astgui', key : 'keyname' } // dbname is optional, defaults to ASTGUI.globals.GUI_DB
+		deleteKey : function( k ){
+			// ASTGUI.ASTDB.deleteKey( { dbname: 'astgui', key : 'keyname' } );
+			// dbname is optional, defaults to ASTGUI.globals.GUI_DB
+			// 	returns true if success, false otherwise
 			if( !k.hasOwnProperty('dbname') ){
 				k.dbname = ASTGUI.globals.GUI_DB ;
 			}
@@ -403,8 +407,10 @@
 		},
 
 
-		getKey : function(k){  // ASTGUI.ASTDB.getKey( { dbname: 'astgui', key : 'keyname' } );
-			// k = { dbname: 'astgui', key : 'keyname' } // dbname is optional, defaults to ASTGUI.globals.GUI_DB
+		getKey : function(k){
+			// ASTGUI.ASTDB.getKey( { dbname: 'astgui', key : 'keyname' } );
+			// dbname is optional, defaults to ASTGUI.globals.GUI_DB
+			// returns null if key is not found, otherwise returns the key-value 
 			if( !k.hasOwnProperty('dbname') ){
 				k.dbname = ASTGUI.globals.GUI_DB ;
 			}
@@ -417,8 +423,12 @@
 			return op.trim();
 		},
 
-		getAllKeys : function(k){ // ASTGUI.ASTDB.getAllKeys( { dbname: 'astgui' } );
-			// k = { dbname: 'astgui' } // dbname is optional, defaults to ASTGUI.globals.GUI_DB
+		getAllKeys : function(k){
+			// ASTGUI.ASTDB.getAllKeys( { dbname: 'astgui' } );
+			// dbname is optional, defaults to ASTGUI.globals.GUI_DB
+			// returns an object with all the keys in the database as properties and key-values as propertyvalues
+			// returns a null if database not found
+
 			if( !k.hasOwnProperty('dbname') ){
 				k.dbname = ASTGUI.globals.GUI_DB ;
 			}
@@ -1373,13 +1383,13 @@
 
 		empty_context: function( ct ){ // ASTGUI.miscFunctions.empty_context({ filename:'somefile.conf', context : 'context_x', cb : fn })
 			try{
-			if( parent.sessionData.PLATFORM.isAST_1_6 ){
-				var u = new listOfSynActions(ct.filename);
-				u.new_action('emptycat', ct.context , '', '' ) ;
-				u.callActions();
-				ct.cb();
-				return;
-			}else{
+			//if( parent.sessionData.PLATFORM.isAST_1_6 ){
+			//	var u = new listOfSynActions(ct.filename);
+			//	u.new_action('emptycat', ct.context , '', '' ) ;
+			//	u.callActions();
+			//	ct.cb();
+			//	return;
+			//}else{
 				var sel_cxt = context2json({ filename: ct.filename , context : ct.context , usf:0 });
 				var x = new listOfActions(ct.filename);
 				sel_cxt.each(function(line){
@@ -1388,7 +1398,7 @@
 					x.new_action('delete', ct.context , var_name, '', var_value);
 				});
 				x.callActions(ct.cb);
-			}
+			//}
 			}catch(err){
 				ASTGUI.Log.Error(err.description);
 			}

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=4408&r1=4407&r2=4408
==============================================================================
--- team/pari/dahdi_support/config/js/pbx.js (original)
+++ team/pari/dahdi_support/config/js/pbx.js Fri Jan  9 10:44:44 2009
@@ -1656,6 +1656,7 @@
 			rg.NAME = '';
 			rg.members = [];
 			rg.strategy = '';
+			rg.ignore = true ;
 
 		if( cxt[0].contains('exten=s,1') &&  cxt[0].toLowerCase().contains('noop(')  ){
 			rg.NAME = cxt[0].betweenXY( '(' , ')' );
@@ -1679,6 +1680,7 @@
 					rg.members.push( args[0] );
 				}
 				rg.ringtime = ( args[1] );
+				rg.ignore =  ( args[2] &&  args[2].contains('i') ) ? true : false ;
 			}
 		});
 
@@ -1725,6 +1727,7 @@
 		if( !rg.fallback ){
 			rg.fallback = 'Hangup'
 		}
+		var tmp_ignore = (rg.ignore) ? '${DIALOPTIONS}i' : '${DIALOPTIONS}' ;
 		var x = new listOfActions();
 		x.filename('extensions.conf');
 		x.new_action('newcat', newrg , '', '');
@@ -1732,12 +1735,12 @@
 		if( rg.strategy == 'ringinorder' ){
 			rg.members.each(
 				function(member){
-					x.new_action('append', newrg, 'exten', 's,n,Dial(' + member +',' + rg.ringtime + ',${DIALOPTIONS}i)' );
+					x.new_action('append', newrg, 'exten', 's,n,Dial(' + member +',' + rg.ringtime + ','+ tmp_ignore + ')' );
 				}
 			);
 		}else{
 			if(rg.members.length){
-				x.new_action('append', newrg, 'exten', 's,n,Dial(' + rg.members.join('&') +',' + rg.ringtime + ',${DIALOPTIONS}i)' );
+				x.new_action('append', newrg, 'exten', 's,n,Dial(' + rg.members.join('&') +',' + rg.ringtime + ',' + tmp_ignore + ')');
 			}
 		}
 		x.new_action( 'append', newrg, 'exten', 's,n,' + rg.fallback );

Modified: team/pari/dahdi_support/config/js/ringgroups.js
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/js/ringgroups.js?view=diff&rev=4408&r1=4407&r2=4408
==============================================================================
--- team/pari/dahdi_support/config/js/ringgroups.js (original)
+++ team/pari/dahdi_support/config/js/ringgroups.js Fri Jan  9 10:44:44 2009
@@ -51,7 +51,7 @@
 	DOM_text_rgExten = _$('text_rgExten');
 	DOM_text_ringTime = _$('text_ringTime');
 	DOM_rg_fb_select = _$('rg_fb_select');
-
+	DOM_edit_ignoreRedir = _$('edit_ignoreRedir');
 };
 
 var ringGroupExistsbyThisName = function( thisName ){
@@ -114,7 +114,9 @@
 		members : TEMP_members,
 		extension : RG_EXTEN ,
 		ringtime : DOM_text_ringTime.value ,
-		fallback : ''
+		fallback : '',
+		ignore : _$('edit_ignoreRedir').checked
+
 	};
 
 	tmp_obj = ASTGUI.toCustomObject(tmp_obj);
@@ -159,6 +161,7 @@
 	if(isNewRG){
 		_$('rgedit_form_caption').innerHTML = 'New RingGroup';
 		DOM_text_rgname.value = '';
+		DOM_edit_ignoreRedir.checked = true;
 		//DOM_select_strategy.selectedIndex = -1 ;
 		ASTGUI.selectbox.clear( DOM_select_ringthesechannels );
 		ASTGUI.selectbox.clear( DOM_select_fromlistofchannels );
@@ -195,6 +198,7 @@
 	});
 	DOM_text_rgExten.value = (c['extension'])?c['extension']:'' ;
 	DOM_text_ringTime.value = (c['ringtime'])?c['ringtime']:'' ;
+	DOM_edit_ignoreRedir.checked = (c['ignore']==true) ;
 	// select value from select box DOM_rg_fb_select
 	var destinations = parent.miscFunctions.getAllDestinations() ;
 

Modified: team/pari/dahdi_support/config/js/trunks_analog.js
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/js/trunks_analog.js?view=diff&rev=4408&r1=4407&r2=4408
==============================================================================
--- team/pari/dahdi_support/config/js/trunks_analog.js (original)
+++ team/pari/dahdi_support/config/js/trunks_analog.js Fri Jan  9 10:44:44 2009
@@ -151,13 +151,11 @@
 			window.location.reload();
 		};
 
-		var tmp_object = {};
-		tmp_object[DAHDICHANNELSTRING] =  scs ;
-		tmp_object[trunkname] = trunk_name ;
-
+		var tmp_object = {'zapchan':scs , 'trunkname': trunk_name } ;
 		Electrical_Fields.each(function(fld){
 			tmp_object[fld] = ASTGUI.getFieldValue( _$(fld) );
 		});
+
 		parent.astgui_managetrunks.addAnalogTrunk( tmp_object , cbf ) ;
 		return;
 	}

Modified: team/pari/dahdi_support/config/ringgroups.html
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/ringgroups.html?view=diff&rev=4408&r1=4407&r2=4408
==============================================================================
--- team/pari/dahdi_support/config/ringgroups.html (original)
+++ team/pari/dahdi_support/config/ringgroups.html Fri Jan  9 10:44:44 2009
@@ -104,7 +104,6 @@
 				<select id="select_fromlistofchannels" style="width: 240px" size=8></select>
 			</td>
 		</tr>
-
 		<tr>	<td colspan=3>
 				<fieldset>
 				<legend>&nbsp;Ring Group Options :&nbsp;</legend>
@@ -122,6 +121,9 @@
 					<tr>	<td align="right" class="field_text">If not answered Goto :&nbsp;</td>
 						<td><select id='rg_fb_select' dfalt='Hangup' required='yes'></select></td>
 					</tr>
+					<tr>	<td align="right" class="field_text">Ignore redirections :&nbsp;</td>
+						<td><input type='checkbox' id='edit_ignoreRedir'></td>
+					</tr>
 					<tr>	<td align="right" colspan=2 height=10></td>
 					</tr>
 					<tr>	<td align=right colspan=2>

More information about the asterisk-gui-commits mailing list