pari: branch asterisknow r797 - in /branches: aadk/ aadk/config/setup/ asteri...

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

Author: pari
Date: Fri Apr 27 11:34:08 2007
New Revision: 797

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

........
r796 | pari | 2007-04-27 11:31:17 -0500 (Fri, 27 Apr 2007) | 1 line

Critical bug fix: [1] add_rule_fromeditform only after oncomplete of delete_callingrule [2] do not reload while something else has to be done ! hah. 
........

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

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr 27 11:34:08 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-793
+/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-796

Modified: branches/aadk/config/setup/5.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/5.html?view=diff&rev=797&r1=796&r2=797
==============================================================================
--- branches/aadk/config/setup/5.html (original)
+++ branches/aadk/config/setup/5.html Fri Apr 27 11:34:08 2007
@@ -441,9 +441,9 @@
 	 }else{	// update exiting rule
 		// delete existing rule
 		// add rule with new values
-		delete_callingrule(pattern_beingedited,pattern_beingedited_priority, oncomplete = function(){location.reload();} );
+		delete_callingrule(pattern_beingedited,pattern_beingedited_priority, oncomplete = function(){
 		add_rule_fromeditform( pattern_beingedited_priority, oncomplete = function(){location.reload();} );
-
+		});
 		//$('userscontent').style.display='none';
 		//$('addrule').disabled =0;
 		//return true;

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr 27 11:34:08 2007
@@ -1,1 +1,1 @@
-/trunk:1-449,489-540,542-557,559,561-577,580-586,588-793
+/trunk:1-449,489-540,542-557,559,561-577,580-586,588-796

Modified: branches/asterisknow/config/setup/5.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/5.html?view=diff&rev=797&r1=796&r2=797
==============================================================================
--- branches/asterisknow/config/setup/5.html (original)
+++ branches/asterisknow/config/setup/5.html Fri Apr 27 11:34:08 2007
@@ -441,9 +441,9 @@
 	 }else{	// update exiting rule
 		// delete existing rule
 		// add rule with new values
-		delete_callingrule(pattern_beingedited,pattern_beingedited_priority, oncomplete = function(){location.reload();} );
+		delete_callingrule(pattern_beingedited,pattern_beingedited_priority, oncomplete = function(){
 		add_rule_fromeditform( pattern_beingedited_priority, oncomplete = function(){location.reload();} );
-
+		});
 		//$('userscontent').style.display='none';
 		//$('addrule').disabled =0;
 		//return true;