rbrindley: branch rbrindley/astman_revamp r4615 - /team/rbrindley/astman_reva...

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Wed Mar 11 13:39:27 2009
New Revision: 4615

URL: http://svn.digium.com/svn-view/asterisk-gui?view=rev&rev=4615
Log:

- merged with latest branches/2.0


Modified:
    team/rbrindley/astman_revamp/config/js/index.js
    team/rbrindley/astman_revamp/config/js/session.js
    team/rbrindley/astman_revamp/config/js/timeintervals.js
    team/rbrindley/astman_revamp/config/js/welcome.js

Modified: team/rbrindley/astman_revamp/config/js/index.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/js/index.js?view=diff&rev=4615&r1=4614&r2=4615
==============================================================================
--- team/rbrindley/astman_revamp/config/js/index.js (original)
+++ team/rbrindley/astman_revamp/config/js/index.js Wed Mar 11 13:39:27 2009
@@ -1042,6 +1042,14 @@
 		}catch(err){}
 	}
 
+        /* unfortunately, there are certain cases in 1.4 where
+         * both commas and pipes aren't supported, such as when
+         * doing time intervals for includes :-/
+         * */
+        if (!sessionData.PLATFORM.isAST_1_6) {
+                top.session.delimiter = '|';
+        }
+
 	var loadGUI = function(){
 		DOM_accordion_div = _$('accordion_div');
 		DOM_mainscreen = _$('mainscreen');

Modified: team/rbrindley/astman_revamp/config/js/session.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/js/session.js?view=diff&rev=4615&r1=4614&r2=4615
==============================================================================
--- team/rbrindley/astman_revamp/config/js/session.js (original)
+++ team/rbrindley/astman_revamp/config/js/session.js Wed Mar 11 13:39:27 2009
@@ -26,6 +26,7 @@
  */
 var session = {
 	debug_log: [], /**< array holding all the logging */
+	delimiter: ',', /**< extensions.conf delimiter, used only in special cases */
 	log: false, /**< boolean toggling logging */
 	/**
 	 * Logging Modes.

Modified: team/rbrindley/astman_revamp/config/js/timeintervals.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/js/timeintervals.js?view=diff&rev=4615&r1=4614&r2=4615
==============================================================================
--- team/rbrindley/astman_revamp/config/js/timeintervals.js (original)
+++ team/rbrindley/astman_revamp/config/js/timeintervals.js Wed Mar 11 13:39:27 2009
@@ -89,7 +89,7 @@
 				var tmp_months = _$('edit_ti_month').value ;
 			}
 
-		ti_time_str = tmp_timerange + ',' + tmp_daysofweek + ',' + tmp_daysofmonth + ',' + tmp_months ;
+		ti_time_str = tmp_timerange + parent.session.delimiter + tmp_daysofweek + parent.session.delimiter + tmp_daysofmonth + parent.session.delimiter + tmp_months ;
 
 		var u = new listOfActions('extensions.conf') ;
 		if( isNewTI == false ){
@@ -102,7 +102,7 @@
 				if( ct.beginsWith(ASTGUI.contexts.TrunkDIDPrefix) && !ct.contains( '_' + ASTGUI.contexts.TimeIntervalPrefix ) ){
 					var this_trunk_mainDID = EXT_CNF[ct] ;
 					this_trunk_mainDID.each(function(this_line){
-						if( this_line.beginsWith('include=') && this_line.contains(ASTGUI.contexts.TrunkDIDPrefix) && this_line.contains( OLD_TI + ',${' ) ){
+						if( this_line.beginsWith('include=') && this_line.contains(ASTGUI.contexts.TrunkDIDPrefix) && this_line.contains( OLD_TI + parent.session.delimiter + '${' ) ){
 							u.new_action( 'update' , ct , 'include' , this_line.afterChar('=').replaceXY(OLD_TI,ti_name) , this_line.afterChar('=') ) ;
 						}
 					});
@@ -138,7 +138,7 @@
 			if( ct.beginsWith(ASTGUI.contexts.TrunkDIDPrefix) && !ct.contains(ASTGUI.contexts.TimeIntervalPrefix) ){
 				var this_trunk_mainDID = EXT_CNF[ct] ;
 				this_trunk_mainDID.each(function(this_line){
-					if( this_line.beginsWith('include=') && this_line.contains(ASTGUI.contexts.TrunkDIDPrefix) && this_line.contains( ASTGUI.contexts.TimeIntervalPrefix + a+',${' ) ){
+					if( this_line.beginsWith('include=') && this_line.contains(ASTGUI.contexts.TrunkDIDPrefix) && this_line.contains( ASTGUI.contexts.TimeIntervalPrefix + a + parent.session.delimiter + '${' ) ){
 						u.new_action( 'delete' , ct , 'include' , '' , this_line.afterChar('=') ) ;
 					}
 				});
@@ -175,7 +175,7 @@
 		ASTGUI.updateFieldToValue( 'edit_ti_name', a ); // name of time interval
 		ASTGUI.resetTheseFields( ['edit_ti_starttime', 'edit_ti_endtime', 'edit_ti_dayofweek_start', 'edit_ti_dayofweek_end', 'edit_ti_from_date', 'edit_ti_month' ] );
 
-		var PIECES = TI_LIST[a].split(',') ;
+		var PIECES = TI_LIST[a].contains(',') ? TI_LIST[a].split(',') : TI_LIST[a].split('|');
 		if( PIECES[0] != '*' ){
 			_$('edit_ti_entireday').checked = false ;
 			ASTGUI.updateFieldToValue( 'edit_ti_starttime', ASTGUI.miscFunctions.asteriskTime_to_AMPM(PIECES[0].split('-')[0] ) );

Modified: team/rbrindley/astman_revamp/config/js/welcome.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/js/welcome.js?view=diff&rev=4615&r1=4614&r2=4615
==============================================================================
--- team/rbrindley/astman_revamp/config/js/welcome.js (original)
+++ team/rbrindley/astman_revamp/config/js/welcome.js Wed Mar 11 13:39:27 2009
@@ -455,7 +455,7 @@
 	var conf_body = $('#sys_status_meetme > .body');
 	var active_conferences = {};
 
-	var show_chans = ASTGUI.cliCommand('show channels concise');
+	var show_chans = ASTGUI.cliCommand('core show channels concise');
 	// DAHDI/pseudo-1529934219!default!s!1!Rsrvd!(None)!!!!3!1086!(None)
 	// SIP/6001-081f6500!DLPN_users!6300!1!Up!MeetMe!6300|MIx!6001!!3!1086!(None)
 	show_chans = parent.ASTGUI.parseCLIResponse(show_chans);