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

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

Author: pari
Date: Thu Apr 26 18:35:19 2007
New Revision: 791

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=791
Log:
Merged revisions 784,787,790 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/trunk

........
r784 | pari | 2007-04-26 16:43:28 -0500 (Thu, 26 Apr 2007) | 1 line

removing duplicate 'loadscreen' call
........
r787 | pari | 2007-04-26 17:15:57 -0500 (Thu, 26 Apr 2007) | 1 line

Fix for http://bugs.digium.com/view.php?id=9580 
........
r790 | pari | 2007-04-26 18:18:39 -0500 (Thu, 26 Apr 2007) | 1 line

fix: dmgeurts reported that renaming trunks is still having issues - http://bugs.digium.com/view.php?id=9606 - thanks
........

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/meetme.html
    branches/aadk/config/trunks.html
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/meetme.html
    branches/asterisknow/config/record.html
    branches/asterisknow/config/trunks.html

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 26 18:35:19 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-767,769-781
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-790

Modified: branches/aadk/config/meetme.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/meetme.html?view=diff&rev=791&r1=790&r2=791
==============================================================================
--- branches/aadk/config/meetme.html (original)
+++ branches/aadk/config/meetme.html Thu Apr 26 18:35:19 2007
@@ -279,7 +279,7 @@
 		}
 	}
 	var newvalue = _$('name').value + ","+ _$('pin').value + "," + _$('pinadmin').value;
-
+	temp_selectedexten = _$('name').value;
 	if ( oldvalue ==  newvalue ){
 		_$('save').disabled = true;
 		_$('cancel').disabled = true;

Modified: branches/aadk/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/trunks.html?view=diff&rev=791&r1=790&r2=791
==============================================================================
--- branches/aadk/config/trunks.html (original)
+++ branches/aadk/config/trunks.html Thu Apr 26 18:35:19 2007
@@ -275,16 +275,14 @@
 		if(old_trunkname != _$('name').value ){ update_didcontext(old_trunkname, _$('name').value); } // rename DID if needed
 	}
 
-
+	return true;
+}
+
+
+function callbacks_savechanges_step2(){
 	hideSPdetails();
 	loadServiceProvidersintotable();
 
-	return true;
-}
-
-
-function callbacks_savechanges_step2(){
-	saveSPdetails();
 	var uri;
 	var newvalue;
 	var _devices = _$('devices') ; 

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 26 18:35:19 2007
@@ -1,1 +1,1 @@
-/trunk:1-449,489-540,542-557,559,561-577,580-586,588-781
+/trunk:1-449,489-540,542-557,559,561-577,580-586,588-790

Modified: branches/asterisknow/config/meetme.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/meetme.html?view=diff&rev=791&r1=790&r2=791
==============================================================================
--- branches/asterisknow/config/meetme.html (original)
+++ branches/asterisknow/config/meetme.html Thu Apr 26 18:35:19 2007
@@ -279,7 +279,7 @@
 		}
 	}
 	var newvalue = _$('name').value + ","+ _$('pin').value + "," + _$('pinadmin').value;
-
+	temp_selectedexten = _$('name').value;
 	if ( oldvalue ==  newvalue ){
 		_$('save').disabled = true;
 		_$('cancel').disabled = true;

Modified: branches/asterisknow/config/record.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/record.html?view=diff&rev=791&r1=790&r2=791
==============================================================================
--- branches/asterisknow/config/record.html (original)
+++ branches/asterisknow/config/record.html Thu Apr 26 18:35:19 2007
@@ -60,7 +60,6 @@
 		newCell0.innerHTML = "<BR><I> No Recorded menus found !!</I> <BR><BR>" +
 			"Please click on 'Record a new Voice Menu' button to record one.<BR><BR>" ;
 	}
-	parent.loadscreen(this);
 }
 
 function clear_table(){

Modified: branches/asterisknow/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/trunks.html?view=diff&rev=791&r1=790&r2=791
==============================================================================
--- branches/asterisknow/config/trunks.html (original)
+++ branches/asterisknow/config/trunks.html Thu Apr 26 18:35:19 2007
@@ -275,16 +275,14 @@
 		if(old_trunkname != _$('name').value ){ update_didcontext(old_trunkname, _$('name').value); } // rename DID if needed
 	}
 
-
+	return true;
+}
+
+
+function callbacks_savechanges_step2(){
 	hideSPdetails();
 	loadServiceProvidersintotable();
 
-	return true;
-}
-
-
-function callbacks_savechanges_step2(){
-	saveSPdetails();
 	var uri;
 	var newvalue;
 	var _devices = _$('devices') ;