[freeside-commits] freeside/httemplate/elements progress-init.html, 1.5, 1.6 xmlhttp.html, 1.2, 1.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail:/tmp/cvs-serv31104/httemplate/elements

Modified Files:
	progress-init.html xmlhttp.html 
Log Message:
fix rate plan editing with new xmlhttp progressbar - use POST instead of GET.  also optimize SQL on rate search screen

Index: xmlhttp.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/xmlhttp.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xmlhttp.html	25 Sep 2005 08:13:35 -0000	1.2
+++ xmlhttp.html	24 Oct 2005 11:56:35 -0000	1.3
@@ -2,11 +2,11 @@
   my ( %opt ) = @_;
 
   my $url = $opt{'url'};
-  #my $action = exists $opt{'action'} ? $opt{'action'} : 'GET';
+  my $method = exists($opt{'method'}) ? $opt{'method'} : 'GET';
   #my @subs = @{ $opt{'subs'};
 
-  $url .= ( ($url =~ /\?/) ? '&' : '?' ).
-          'sub=';
+  $url .= ( ($url =~ /\?/) ? '&' : '?' )
+    if $method eq 'GET';
 
 %>
 
@@ -33,43 +33,64 @@
 
   <% foreach my $func ( @{$opt{'subs'}} ) { 
 
-       my $furl = $url . uri_escape($func);
+       my $furl = $url;
        $furl =~ s/\"/\\\\\"/; #javascript escape
 
   %>
 
     function <%=$func%>() {
-	// count args; build URL
-	var url = "<%=$furl%>";
-	var a = <%=$func%>.arguments;
-	var args;
-	var len;
-	if ( a && typeof a  == 'object'  && a[0].constructor == Array ) {
-	    args = a[0];
+        // count args; build URL
+        var url = "<%=$furl%>";
+        var a = <%=$func%>.arguments;
+
+        var args;
+        var len;
+        var content = 'sub=<%= uri_escape($func) %>';
+        if ( a && typeof a  == 'object'  && a[0].constructor == Array ) {
+            args = a[0];
             len = args.length
-	} else {
+        } else {
             args = a;
             len = args.length - 1;
-	}
-	for (var i = 0; i < len; i++) 
-	    url = url + "&arg=" + escape(args[i]);
-	url = url.replace( /[+]/g, '%2B'); // fix the unescaped plus signs 
-	var xmlhttp = rs_init_object();
-	xmlhttp.open("GET", url, true);
-	xmlhttp.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT");
-	xmlhttp.onreadystatechange = function() {
-	    if (xmlhttp.readyState != 4) 
-		return;
-	    //rs_debug("received " + x.responseText);
+        }
+        for (var i = 0; i < len; i++) 
+            content = content + "&arg=" + escape(args[i]);
+        content = content.replace( /[+]/g, '%2B'); // fix unescaped plus signs 
 
-	    if (xmlhttp.status != 200) {
-	      alert(xmlhttp.status + " status connecting to " + url);
-	    } else {
+        if ( '<%=$method%>' == 'GET' ) {
+          url = url + content;
+        }
+
+        //alert('<%=$method%> ' + url);
+
+        var xmlhttp = rs_init_object();
+        xmlhttp.open("<%=$method%>", url, true);
+
+        xmlhttp.onreadystatechange = function() {
+            if (xmlhttp.readyState != 4) 
+        	return;
+
+            if (xmlhttp.status != 200) {
+              alert(xmlhttp.status + " status connecting to " + url);
+            } else {
               var data = xmlhttp.responseText;
+              //alert('received response: ' + data);
               a[a.length-1](data);
             }
         }
-        xmlhttp.send(null);
+
+        if ( '<%=$method%>' == 'POST' ) {
+
+          xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+          xmlhttp.send(content);
+
+        } else {
+
+          xmlhttp.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT");
+          xmlhttp.send(null);
+
+        }
+
         //rs_debug("x_$func_name url = " + url);
         //rs_debug("x_$func_name waiting..");
     }

Index: progress-init.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/progress-init.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- progress-init.html	25 Sep 2005 08:13:35 -0000	1.5
+++ progress-init.html	24 Oct 2005 11:56:35 -0000	1.6
@@ -12,8 +12,9 @@
 %>
 
 <%= include('/elements/xmlhttp.html',
-              'url'  => $action,
-              'subs' => [ 'start_job' ],
+              'method' => 'POST',
+              'url'    => $action,
+              'subs'   => [ 'start_job' ],
            )
 %>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
@@ -27,6 +28,8 @@
 
 function <%=$key%>process () {
 
+  //alert('<%=$key%>process for form <%=$formname%>');
+
   document.<%=$formname%>.submit.disabled=true;
 
   overlib( 'Submitting job to server...', WIDTH, 432, HEIGHT, 136, CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
@@ -40,8 +43,10 @@
        )
     {
         if ( field.type == 'select-multiple' ) {
+          //alert('select-multiple ' + field.name);
           for (var j=0; j < field.options.length; j++) {
             if ( field.options[j].selected ) {
+              //alert(field.name + ' => ' + field.options[j].value);
               Hash[x++] = field.name;
               Hash[x++] = field.options[j].value;
             }
@@ -61,6 +66,8 @@
   // jsrsPOST = true;
   // jsrsExecute( '<%= $action %>', <%=$key%>myCallback, 'start_job', Hash );
 
+  //alert('start_job( ' + Hash + ', <%=$key%>myCallback )' );
+  //alert('start_job()' );
   start_job( Hash, <%=$key%>myCallback );
 
 }