rbrindley: branch 2.0 r4718 - in /branches/2.0/config: ./ js/

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Wed Apr  8 08:25:38 2009
New Revision: 4718

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

- added isAST_1_6_1, versions needs to be reworked
- added isAST_1_6_1 definition
- err.description doesn't exists, its just err
- using isAST_1_6_1 for getTrunkStatus


Modified:
    branches/2.0/config/index.html
    branches/2.0/config/js/astman.js
    branches/2.0/config/js/index.js
    branches/2.0/config/js/pbx2.js

Modified: branches/2.0/config/index.html
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/index.html?view=diff&rev=4718&r1=4717&r2=4718
==============================================================================
--- branches/2.0/config/index.html (original)
+++ branches/2.0/config/index.html Wed Apr  8 08:25:38 2009
@@ -35,7 +35,8 @@
 		AA50_SKU : '', // sessionData.PLATFORM.AA50_SKU
 		isANOW : false, // Asterisk Now
 		isAST_1_4 : true, // we assume is Asterisk 1.4 by default, sessionData.PLATFORM.isAST_1_4
-		isAST_1_6 : false
+		isAST_1_6 : false,
+		isAST_1_6_1 : false
 	},
 
 	AsteriskVersionString : '',

Modified: branches/2.0/config/js/astman.js
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/js/astman.js?view=diff&rev=4718&r1=4717&r2=4718
==============================================================================
--- branches/2.0/config/js/astman.js (original)
+++ branches/2.0/config/js/astman.js Wed Apr  8 08:25:38 2009
@@ -1200,7 +1200,8 @@
 			}
 			if((line.beginsWith(host) || (this_IP && line.beginsWith(this_IP + ' ')))  && line.contains(' ' + uname_lc + ' ')) {
 				var vals = line_orig.split(/[ \t][ \t]*/); /* Host, Username, Refresh, State, Reg.Time */
-				var state = (ttype === 'sip') ? vals[4] : vals[5];
+				var sip_index = parent.sessionData.PLATFORM.isAST_1_6_1 ? 4 : 3;
+				var state = (ttype === 'sip') ? vals[sip_index] : vals[5];
 				switch(state) {
 				case 'registered':
 				case 'Registered':
@@ -1212,7 +1213,7 @@
 		}
 		return '<font color=red>Unrecognized Trunk</font>';
 		}catch(err){
-			top.log.error(err.description);
+			top.log.error(err);
 		}
 	},
 

Modified: branches/2.0/config/js/index.js
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/js/index.js?view=diff&rev=4718&r1=4717&r2=4718
==============================================================================
--- branches/2.0/config/js/index.js (original)
+++ branches/2.0/config/js/index.js Wed Apr  8 08:25:38 2009
@@ -113,6 +113,7 @@
 			if ( resp_lower.contains("branches/1.6")  || resp_lower.contains("asterisk/1.6") ||  resp_lower.contains("svn-branch-1.6") ||  resp_lower.contains("svn-trunk-")  ){
 				sessionData.PLATFORM.isAST_1_4 = false ;
 				sessionData.PLATFORM.isAST_1_6 = true ;
+				sessionData.PLATFORM.isAST_1_6_1 = resp_lower.contains('1.6.1') ? true : false;
 			} else { /* if system is either 1.4 or unknown */
 				sessionData.PLATFORM.isAST_1_4 = true ;
 				sessionData.PLATFORM.isAST_1_6 = false ;

Modified: branches/2.0/config/js/pbx2.js
URL: http://svn.digium.com/svn-view/asterisk-gui/branches/2.0/config/js/pbx2.js?view=diff&rev=4718&r1=4717&r2=4718
==============================================================================
--- branches/2.0/config/js/pbx2.js (original)
+++ branches/2.0/config/js/pbx2.js Wed Apr  8 08:25:38 2009
@@ -1175,7 +1175,7 @@
 
 		trunk.signalling = '';
 		trunk.channel = '';
-		var zap_channels = ASTGUI.miscFunctions.chanStringtoArray(chans);
+		var zap_channels = ASTGUI.miscFunctions.chanStringToArray(chans);
 		zap_channels.each(function(ch) {
 			var ls = ASTGUI.cloneObject(sessionData.PORTS_SIGNALLING.ls);
 			var sg = (ls.contains(ch)) ? 'fxs_ls' : 'fxs_ks';