[freeside-commits] freeside/httemplate/misc inventory_item-import.html, 1.9, 1.10 tax-import.cgi, 1.10, 1.11 cust_main-import.cgi, 1.18, 1.19 cust_pkg-import.html, 1.3, 1.4 phone_avail-import.html, 1.8, 1.9 part_device-import.html, 1.1, 1.2 cdr-import.html, 1.9, 1.10 rate_edit_excel.html, 1.3, 1.4 rate-import.html, 1.1, 1.2

Ivan,,, ivan at wavetail.420.am
Tue Apr 26 17:48:12 PDT 2011


Update of /home/cvs/cvsroot/freeside/httemplate/misc
In directory wavetail.420.am:/tmp/cvs-serv31526/misc

Modified Files:
	inventory_item-import.html tax-import.cgi cust_main-import.cgi 
	cust_pkg-import.html phone_avail-import.html 
	part_device-import.html cdr-import.html rate_edit_excel.html 
	rate-import.html 
Log Message:
fix submission bug w/chrome, RT#12638

Index: cust_pkg-import.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/cust_pkg-import.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- cust_pkg-import.html	9 Aug 2010 19:20:13 -0000	1.3
+++ cust_pkg-import.html	27 Apr 2011 00:48:10 -0000	1.4
@@ -3,15 +3,15 @@
 Import a file containing package records.
 <BR><BR>
 
-<% include( '/elements/form-file_upload.html',
+<& /elements/form-file_upload.html,
               'name'      => 'PackageImportForm',
               'action'    => 'process/cust_pkg-import.html',
               'num_files' => 1,
               'fields'    => [ 'agentnum', 'pkgbatch', 'format' ],
               'message'   => 'Package import successful',
               'url'       => $p."search/cust_pkg.cgi?pkgbatch=$pkgbatch",
-          )
-%>
+     'onsubmit'  => "document.PackageImportForm.submitButton.disabled=true;"
+&>
 
 <% &ntable("#cccccc", 2) %>
 
@@ -49,9 +49,9 @@
   <TR>
     <TD COLSPAN=2 ALIGN="center" STYLE="padding-top:6px">
       <INPUT TYPE    = "submit"
-             ID      = "submit"
+             NAME    = "submitButton"
+             ID      = "submitButton"
              VALUE   = "Import file"
-             onClick = "document.PackageImportForm.submit.disabled=true;"
       >
     </TD>
   </TR>

Index: cust_main-import.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/cust_main-import.cgi,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -d -r1.18 -r1.19
--- cust_main-import.cgi	16 Jan 2011 02:25:30 -0000	1.18
+++ cust_main-import.cgi	27 Apr 2011 00:48:10 -0000	1.19
@@ -3,15 +3,15 @@
 Import a file containing customer records.
 <BR><BR>
 
-<% include( '/elements/form-file_upload.html',
+<& /elements/form-file_upload.html,
               'name'      => 'CustomerImportForm',
               'action'    => 'process/cust_main-import.cgi',
               'num_files' => 1,
               'fields'    => [ 'agentnum', 'custbatch', 'format' ],
               'message'   => 'Customer import successful',
               'url'       => $p."search/cust_main.html?custbatch=$custbatch",
-          )
-%>
+     'onsubmit'  => "document.CustomerImportForm.submitButton.disabled=true;",
+&>
 
 <% &ntable("#cccccc", 2) %>
 
@@ -69,9 +69,9 @@
   <TR>
     <TD COLSPAN=2 ALIGN="center" STYLE="padding-top:6px">
       <INPUT TYPE    = "submit"
-             ID      = "submit"
+             NAME    = "submitButton"
+             ID      = "submitButton"
              VALUE   = "Import file"
-             onClick = "document.CustomerImportForm.submit.disabled=true;"
       >
     </TD>
   </TR>

Index: phone_avail-import.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/phone_avail-import.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -d -r1.8 -r1.9
--- phone_avail-import.html	22 Apr 2011 23:17:39 -0000	1.8
+++ phone_avail-import.html	27 Apr 2011 00:48:10 -0000	1.9
@@ -3,15 +3,16 @@
 Import a file containing phone numbers (DIDs).
 <BR><BR>
 
-<% include( '/elements/form-file_upload.html',
+<& /elements/form-file_upload.html,
               'name'      => 'PhonenumImportForm',
               'action'    => 'process/phone_avail-import.html',
               'num_files' => 1,
-              'fields'    => [ 'format', 'availbatch', 'exportnum', 'countrycode', 'ordernum', 'confirmed', 'vendor_order_id' ],
+     'fields'    => [ 'format', 'availbatch', 'exportnum', 'countrycode',
+                      'ordernum', 'confirmed', 'vendor_order_id' ],
               'message'   => 'DID import successful',
               'url'       => $p."search/phone_avail.html?availbatch=$availbatch",
-          )
-%>
+     'onsubmit'  => "document.PhonenumImportForm.submitButton.disabled=true;",
+&>
 
 <% &ntable("#cccccc", 2) %>
 
@@ -86,9 +87,9 @@
   <TR>
     <TD COLSPAN=2 ALIGN="center" STYLE="padding-top:6px">
       <INPUT TYPE    = "submit"
-             ID      = "submit"
+             ID      = "submitButton"
+             NAME    = "submitButton"
              VALUE   = "Import file"
-             onClick = "document.PhonenumImportForm.submit.disabled=true;"
       >
     </TD>
   </TR>

Index: rate_edit_excel.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/rate_edit_excel.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- rate_edit_excel.html	21 Mar 2010 23:13:24 -0000	1.3
+++ rate_edit_excel.html	27 Apr 2011 00:48:10 -0000	1.4
@@ -4,15 +4,15 @@
   <FONT COLOR="#FF0000">WARNING: This functionality does not yet preserve connection charges.</FONT><BR><BR>
 % }
 
-<% include( '/elements/form-file_upload.html',
+<& /elements/form-file_upload.html,
               'name'      => 'RateImportForm',
               'action'    => 'process/rate_edit_excel.html',
               'num_files' => 1,
               'fields'    => [ 'format' ],
               'message'   => 'Rate edit successful',
               'url'       => $p."browse/rate_region.html",
-          )
-%>
+     'onsubmit'  => "document.RateImportForm.submitButton.disabled=true;"
+&>
 
 <% &ntable("#cccccc", 2) %>
 
@@ -46,9 +46,9 @@
   <TR>
     <TD COLSPAN=2 ALIGN="center" STYLE="padding-top:6px">
       <INPUT TYPE    = "submit"
-             ID      = "submit"
+             ID      = "submitButton"
+             NAME    = "submitButton"
              VALUE   = "Upload"
-             onClick = "document.RateImportForm.submit.disabled=true;"
       >
     </TD>
   </TR>

Index: cdr-import.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/cdr-import.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -d -r1.9 -r1.10
--- cdr-import.html	31 Dec 2008 03:28:57 -0000	1.9
+++ cdr-import.html	27 Apr 2011 00:48:10 -0000	1.10
@@ -1,14 +1,14 @@
 <% include("/elements/header.html",'Call Detail Record Import') %>
   
-<% include( '/elements/form-file_upload.html',
+<& /elements/form-file_upload.html,
               'name'      => 'CDRImportForm',
               'action'    => 'process/cdr-import.html',
               'num_files' => 1,
               'fields'    => [ 'format', 'cdrbatch', ],
               'message'   => 'CDR import successful',
               'url'       => $p."search/cdr.html?cdrbatch=$cdrbatch",
-          )
-%>
+     'onsubmit'  => "document.CDRImportForm.submitButton.disabled=true;",
+&>
 
 Import a file containing Call Detail Records (CDRs).<BR><BR>
 
@@ -36,9 +36,9 @@
   <TR>
     <TD COLSPAN=2 ALIGN="center" STYLE="padding-top:6px">
       <INPUT TYPE    = "submit"
-             ID      = "submit"
+             ID      = "submitButton"
+             NAME    = "submitButton"
              VALUE   = "Import file"
-             onClick = "document.InventoryItemImportForm.submit.disabled=true;"
       >
     </TD>
   </TR>

Index: part_device-import.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/part_device-import.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- part_device-import.html	30 Jun 2009 01:42:55 -0000	1.1
+++ part_device-import.html	27 Apr 2011 00:48:10 -0000	1.2
@@ -3,15 +3,15 @@
 Import a file containing phone device types, one per line.
 <BR><BR>
 
-<% include( '/elements/form-file_upload.html',
+<& /elements/form-file_upload.html,
               'name'      => 'PartDeviceImportForm',
               'action'    => 'process/part_device-import.html',
               'num_files' => 1,
               'fields'    => [ 'format', ], 
               'message'   => 'Device type import successful',
               'url'       => $p.'browse/part_device.html',
-          )
-%>
+     'onsubmit'  => "document.PartDeviceImportForm.submitButton.disabled=true;",
+&>
 
 <% &ntable("#cccccc", 2) %>
 
@@ -26,9 +26,9 @@
   <TR>
     <TD COLSPAN=2 ALIGN="center" STYLE="padding-top:6px">
       <INPUT TYPE    = "submit"
-             ID      = "submit"
+             ID      = "submitButton"
+             NAME    = "submitButton"
              VALUE   = "Import file"
-             onClick = "document.PartDeviceImportForm.submit.disabled=true;"
       >
     </TD>
   </TR>

Index: rate-import.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/rate-import.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- rate-import.html	25 May 2010 12:41:22 -0000	1.1
+++ rate-import.html	27 Apr 2011 00:48:10 -0000	1.2
@@ -1,14 +1,14 @@
 <% include("/elements/header.html",'Import Rate Plan') %>
 
-<% include( '/elements/form-file_upload.html',
+<& /elements/form-file_upload.html,
               'name'      => 'RateImportForm',
               'action '   => 'process/rate-import.html',
               'num_files' => 1,
               'fields'    => [ 'ratename' ],
               'message'   => 'Rate plan import successful',
 #              'url'       => $p."browse/rate_detail.cgi?ratenum=$ratenum", #XXX how?
-          )
-%>
+     'onsubmit'  => "document.RateImportForm.submitButton.disabled=true;",
+&>
 
 <% &ntable("#cccccc", 2) %>
 
@@ -28,9 +28,9 @@
   <TR>
     <TD COLSPAN=2 ALIGN="center" STYLE="padding-top:6px">
       <INPUT TYPE    = "submit"
-             ID      = "submit"
+             ID      = "submitButton"
+             NAME    = "submitButton"
              VALUE   = "Import rate plan"
-             onClick = "document.RateImportForm.submit.disabled=true;"
       >
     </TD>
   </TR>

Index: inventory_item-import.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/inventory_item-import.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -d -r1.9 -r1.10
--- inventory_item-import.html	23 Jul 2010 00:11:51 -0000	1.9
+++ inventory_item-import.html	27 Apr 2011 00:48:10 -0000	1.10
@@ -3,8 +3,8 @@
 Import a file containing <% PL($inventory_class->classname) %>, one per line.
 <BR><BR>
 
-<% include( '/elements/form-file_upload.html',
-              'name'      => 'InventoryItemImportForm',
+<& /elements/form-file_upload.html,
+     'name'      => 'InventoryImportForm',
               'action'    => 'process/inventory_item-import.html',
               'num_files' => 1,
               #'fields'    => [ 'format', 'itembatch', 'classnum', 'agentnum' ],
@@ -13,8 +13,8 @@
               #XXX redirect via $itembatch?  or just back to class browse?
               #'url'       => $p."search/phone_avail.html?availbatch=$availbatch",
               'url'       => $p."search/inventory_item.html?classnum=$classnum;avail=1",
-          )
-%>
+     'onsubmit'  => "document.InventoryImportForm.submitButton.disabled=true;",
+&>
 
 <% &ntable("#cccccc", 2) %>
 
@@ -38,9 +38,9 @@
   <TR>
     <TD COLSPAN=2 ALIGN="center" STYLE="padding-top:6px">
       <INPUT TYPE    = "submit"
-             ID      = "submit"
+             NAME  = "submitButton"
+             ID    = "submitButton"
              VALUE   = "Import file"
-             onClick = "document.InventoryItemImportForm.submit.disabled=true;"
       >
     </TD>
   </TR>

Index: tax-import.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/tax-import.cgi,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -d -r1.10 -r1.11
--- tax-import.cgi	3 Mar 2010 01:39:56 -0000	1.10
+++ tax-import.cgi	27 Apr 2011 00:48:10 -0000	1.11
@@ -3,14 +3,14 @@
 Import a CSV file set containing tax rate records.
 <BR><BR>
 
-<% include( '/elements/form-file_upload.html',
+<& /elements/form-file_upload.html,
               'name'      => 'TaxRateUpload',
               'action'    => 'process/tax-import.cgi', 
               'num_files' => 6,
               'fields'    => [ 'format', 'reload' ],
               'message'   => 'Tax rates imported',
-          )
-%>
+     'onsubmit'  => "document.TaxRateUpload.submitButton.disabled=true;",
+&>
 
 <% &ntable("#cccccc", 2) %>
 
@@ -55,8 +55,9 @@
   <TR>
     <TD COLSPAN=2 ALIGN="center" STYLE="padding-top:6px">
       <INPUT TYPE    = "submit"
+             NAME  = "submitButton"
+             ID    = "submitButton"
              VALUE   = "Import CSV files"
-             onClick = "document.TaxRateUpload.submit.disabled=true;"
       >
     </TD>
   </TR>



More information about the freeside-commits mailing list