pari: branch asterisknow r687 - in /branches: aadk/ aadk/config/ aadk/config/...

[asterisk-gui-commits at lists.digium.com]

Author: pari
Date: Tue Apr 17 17:48:28 2007
New Revision: 687

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=687
Log:
Merged revisions 685-686 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/trunk

........
r685 | pari | 2007-04-17 16:41:05 -0500 (Tue, 17 Apr 2007) | 1 line

BugFix: when renaming a trunk - the context is not being updated
........
r686 | pari | 2007-04-17 17:24:10 -0500 (Tue, 17 Apr 2007) | 1 line

bug Fix: Gui saying this analog phone is already assigned to another user extension while that is not the case
........

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/setup/7.html
    branches/aadk/config/trunks.html
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/setup/7.html
    branches/asterisknow/config/trunks.html

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr 17 17:48:28 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-682
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-686

Modified: branches/aadk/config/setup/7.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/7.html?view=diff&rev=687&r1=686&r2=687
==============================================================================
--- branches/aadk/config/setup/7.html (original)
+++ branches/aadk/config/setup/7.html Tue Apr 17 17:48:28 2007
@@ -119,8 +119,10 @@
 	if(allow_aliasextns == "no"){	// check whether the selected analog line is assigned to another user extension
 		var tmp_usedanaloglines = [] ;
 		for ( var i=1; i < _$('devices').stored_config.categories.length ; i++){
-			if ( _$('devices').stored_config.categories[i].fieldbyname['zapchan'] && _$('devices').stored_config.categories[i].fieldbyname.zapchan.length )
+			if ( _$('devices').stored_config.categories[i] != null ){
+			if ( _$('devices').stored_config.categories[i].fieldbyname['zapchan'] && _$('devices').stored_config.categories[i].fieldbyname.zapchan.length && _$('devices').stored_config.categories[i].name != _$('devices').value )
 				tmp_usedanaloglines.push(_$('devices').stored_config.categories[i].fieldbyname.zapchan);
+			}
 		}
 		if ( InArray(tmp_usedanaloglines,_$('zapchan').value)){
 			alert("This Analog Phone has already been assigned to another user extension.\n Please select a different Phone");

Modified: branches/aadk/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/trunks.html?view=diff&rev=687&r1=686&r2=687
==============================================================================
--- branches/aadk/config/trunks.html (original)
+++ branches/aadk/config/trunks.html Tue Apr 17 17:48:28 2007
@@ -296,7 +296,7 @@
 }
 
 function ifedit_existing(){
-
+	_$('context').value =  asterisk_guiTDPrefix + _$('custom_trunkname').value  ;
 }
 
 

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr 17 17:48:28 2007
@@ -1,1 +1,1 @@
-/trunk:1-449,489-540,542-557,559,561-577,580-586,588-681
+/trunk:1-449,489-540,542-557,559,561-577,580-586,588-686

Modified: branches/asterisknow/config/setup/7.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/7.html?view=diff&rev=687&r1=686&r2=687
==============================================================================
--- branches/asterisknow/config/setup/7.html (original)
+++ branches/asterisknow/config/setup/7.html Tue Apr 17 17:48:28 2007
@@ -119,8 +119,10 @@
 	if(allow_aliasextns == "no"){	// check whether the selected analog line is assigned to another user extension
 		var tmp_usedanaloglines = [] ;
 		for ( var i=1; i < _$('devices').stored_config.categories.length ; i++){
-			if ( _$('devices').stored_config.categories[i].fieldbyname['zapchan'] && _$('devices').stored_config.categories[i].fieldbyname.zapchan.length )
+			if ( _$('devices').stored_config.categories[i] != null ){
+			if ( _$('devices').stored_config.categories[i].fieldbyname['zapchan'] && _$('devices').stored_config.categories[i].fieldbyname.zapchan.length && _$('devices').stored_config.categories[i].name != _$('devices').value )
 				tmp_usedanaloglines.push(_$('devices').stored_config.categories[i].fieldbyname.zapchan);
+			}
 		}
 		if ( InArray(tmp_usedanaloglines,_$('zapchan').value)){
 			alert("This Analog Phone has already been assigned to another user extension.\n Please select a different Phone");
@@ -431,4 +433,4 @@
 <div id="bg_transparent" STYLE="display:none; position: absolute; left: 0; top: 0; width:100%; height:100%;  background-color:#FFFFFF; filter:alpha(opacity=50); -moz-opacity:.50;opacity:.50; border-width: 0px; z-index:4">
 </div>
 </BODY>
-</HTML>
+</HTML>

Modified: branches/asterisknow/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/trunks.html?view=diff&rev=687&r1=686&r2=687
==============================================================================
--- branches/asterisknow/config/trunks.html (original)
+++ branches/asterisknow/config/trunks.html Tue Apr 17 17:48:28 2007
@@ -296,7 +296,7 @@
 }
 
 function ifedit_existing(){
-
+	_$('context').value =  asterisk_guiTDPrefix + _$('custom_trunkname').value  ;
 }