Merged revisions 31030-31044 via svnmerge from 1.2-trunk

Fixed calling final step of dataflow import Fixed bundle js for calculating children with FPT
albertobraschi · Dec 29, 2008 · 4085ec8 · 4085ec8
1 parent 3a77e57
commit 4085ec8
Show file tree

Hide file tree

Showing 7 changed files with 873 additions and 643 deletions.
diff --git a/STATUS.txt b/STATUS.txt
@@ -172,6 +172,8 @@ FIXED BUGS:
     Fixed hiding of flex uploader after removing row of downloadbale sample|link
     Fixed FPT editing for bundle products
     Fixed generatting filenames for create custom extensions interface in Windows
+    Fixed calling final step of dataflow import
+    Fixed bundle js for calculating children with FPT
 
 
 CHANGES:

diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php
@@ -174,7 +174,7 @@ function execImportData() {
         })});
         new Ajax.Request("' . $this->getUrl('*/*/batchFinish', array('id' => $batchModel->getId())) .'", {
             method: "post",
-            parameters: {form_key: "'.$this.'"},
+            parameters: {form_key: FORM_KEY},
             onComplete: function(transport) {
                 if (transport.responseText.isJSON()) {
                     var response = transport.responseText.evalJSON();