espiceland: branch 2.0 r5132 - /branches/2.0/config/js/

[SVN commits to the Asterisk-GUI project]

Author: espiceland
Date: Fri Dec 10 13:31:35 2010
New Revision: 5132

URL: http://svnview.digium.com/svn/asterisk-gui?view=rev&rev=5132
Log:
Fix bug with recent channel groups feature where digital spans are treated as analog when dealing with calling rules. ASTGUI-335.

Modified:
    branches/2.0/config/js/callingrules.js
    branches/2.0/config/js/pbx2.js

Modified: branches/2.0/config/js/callingrules.js
URL: http://svnview.digium.com/svn/asterisk-gui/branches/2.0/config/js/callingrules.js?view=diff&rev=5132&r1=5131&r2=5132
==============================================================================
--- branches/2.0/config/js/callingrules.js (original)
+++ branches/2.0/config/js/callingrules.js Fri Dec 10 13:31:35 2010
@@ -147,7 +147,7 @@
 		ASTGUI.events.add( DOM_new_cr_button , 'click' ,  newCallingRule_form);
 
  		// list non-analog trunks by trunk.
- 		var t = parent.pbx.trunks.list({iax: true, providers: true, sip: true});
+ 		var t = parent.pbx.trunks.list({iax: true, providers: true, sip: true, bri: true, pri: true});
 		var TMP_FORSORT = [];
 		t.each(function(item){
 			TMP_FORSORT.push( parent.pbx.trunks.getName(item) + ':::::::' +  item);

Modified: branches/2.0/config/js/pbx2.js
URL: http://svnview.digium.com/svn/asterisk-gui/branches/2.0/config/js/pbx2.js?view=diff&rev=5132&r1=5131&r2=5132
==============================================================================
--- branches/2.0/config/js/pbx2.js (original)
+++ branches/2.0/config/js/pbx2.js Fri Dec 10 13:31:35 2010
@@ -1342,7 +1342,7 @@
 };
 
 pbx.trunks.getTrunkNamesByGroup = function(group) {
-	var t = this.list({analog: true, bri: true, pri: true});
+	var t = this.list({analog: true});
 	var a = [];
 	t.each(function(item){
 		var type = parent.pbx.trunks.getType(item);
@@ -1402,7 +1402,7 @@
 };
 
 pbx.trunks.listAllGroups = function() {
-	var t = this.list({analog: true, bri: true, pri: true});
+	var t = this.list({analog: true});
 	var a = [];
 	t.each(function(item){
 		var type = parent.pbx.trunks.getType(item);
@@ -1595,7 +1595,7 @@
 pbx.trunks.isAnalog = function(trunk) {
 	if(trunk.indexOf("group_" == -1)){
 		var type = this.getType(trunk);
-		if(type == 'analog' || type == 'bri' || type == 'pri'){
+		if(type == 'analog'){
 			return true;
 		}
 	}