Skip to content
Browse files

Update as of 10/11/2012

* Removed unused `Mage_DesignEditor_Model_History_Compact_Diff` class
* Fixes:
  * Incorrect title for Manage Products page
  * 'Element with ID 'wishlist_column_qty' already exists.' error on Manage Shopping Cart page
  * Incorrect redirect on "Print Shipping Labels" action, when shipment without shipping label selected
  * Error message is displayed twice, when restoring admin password with captcha enabled
  * Impossible to retrieve admin password, when captcha is enabled
  • Loading branch information...
1 parent 72f1ee6 commit a310c826650b749669ce607451c423c1576c392d @magento-team magento-team committed Oct 11, 2012
View
10 CHANGELOG.markdown
@@ -1,3 +1,13 @@
+Update as of 10/11/2012
+======================
+* Removed unused `Mage_DesignEditor_Model_History_Compact_Diff` class
+* Fixes:
+ * Incorrect title for Manage Products page
+ * 'Element with ID 'wishlist_column_qty' already exists.' error on Manage Shopping Cart page
+ * Incorrect redirect on "Print Shipping Labels" action, when shipment without shipping label selected
+ * Error message is displayed twice, when restoring admin password with captcha enabled
+ * Impossible to retrieve admin password, when captcha is enabled
+
Update as of 10/09/2012
======================
* Performance Testing Framework improvements:
View
1 app/code/core/Mage/Adminhtml/view/adminhtml/catalog.xml
@@ -31,7 +31,6 @@
<reference name="head">
<action method="addJs"><file>jquery/jquery-1.7.1.min.js</file></action>
<action method="addJs"><file>mage/jquery-no-conflict.js</file></action>
- <action method="setTitle" translate="title"><title>Catalog</title></action>
</reference>
<reference name="menu">
<action method="setActive"><itemId>Mage_Catalog::catalog_products</itemId></action>
View
24 app/code/core/Mage/Captcha/etc/config.xml
@@ -55,14 +55,6 @@
</captcha>
</observers>
</controller_action_predispatch_customer_account_loginPost>
- <controller_action_predispatch_customer_account_forgotpasswordpost>
- <observers>
- <captcha>
- <class>Mage_Captcha_Model_Observer</class>
- <method>checkForgotPassword</method>
- </captcha>
- </observers>
- </controller_action_predispatch_customer_account_forgotpasswordpost>
<controller_action_predispatch_customer_account_createpost>
<observers>
<captcha>
@@ -71,14 +63,6 @@
</captcha>
</observers>
</controller_action_predispatch_customer_account_createpost>
- <controller_action_predispatch_adminhtml_auth_forgotpassword>
- <observers>
- <captcha>
- <class>Mage_Captcha_Model_Observer</class>
- <method>checkUserForgotPasswordBackend</method>
- </captcha>
- </observers>
- </controller_action_predispatch_adminhtml_auth_forgotpassword>
<admin_user_authenticate_before>
<observers>
<captcha>
@@ -181,6 +165,14 @@
</captcha>
</observers>
</controller_action_predispatch_adminhtml_auth_forgotpassword>
+ <controller_action_predispatch_customer_account_forgotpasswordpost>
+ <observers>
+ <captcha>
+ <class>Mage_Captcha_Model_Observer</class>
+ <method>checkForgotPassword</method>
+ </captcha>
+ </observers>
+ </controller_action_predispatch_customer_account_forgotpasswordpost>
</events>
</adminhtml>
<default>
View
44 app/code/core/Mage/DesignEditor/Model/History/Compact/Diff.php
@@ -1,44 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Mage
- * @package Mage_DesignEditor
- * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-/**
- * History compaction strategy to compact file changes
- */
-class Mage_DesignEditor_Model_History_Compact_Diff implements Mage_DesignEditor_Model_History_CompactInterface
-{
- /**
- * Run compact strategy on given collection
- *
- * @param Mage_DesignEditor_Model_Change_Collection $collection
- * @return Mage_DesignEditor_Model_History_Compact_Layout|Mage_DesignEditor_Model_History_CompactInterface
- */
- public function compact(Mage_DesignEditor_Model_Change_Collection $collection)
- {
- //@TODO compact strategies for file changes are not determined yet
-
- return $this;
- }
-}
View
17 dev/tests/integration/testsuite/Mage/Captcha/Model/ObserverTest.php
@@ -98,4 +98,21 @@ public function testCheckUserForgotPasswordBackendWhenCaptchaFailed()
$this->dispatch('backend/admin/auth/forgotpassword');
$this->assertRedirect($this->stringContains('backend/admin/auth/forgotpassword'));
}
+
+ /**
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
+ * @magentoConfigFixture admin_store admin/captcha/enable 1
+ * @magentoConfigFixture admin_store admin/captcha/forms backend_forgotpassword
+ * @magentoConfigFixture admin_store admin/captcha/mode always
+ */
+ public function testCheckUnsuccessfulMessageWhenCaptchaFailed()
+ {
+ Mage::getSingleton('Mage_Backend_Model_Url')->turnOffSecretKey();
+ $this->getRequest()->setPost(array('email' => 'dummy@dummy.com', 'captcha' => '1234'));
+ $this->dispatch('backend/admin/auth/forgotpassword');
+ $errorMessage = Mage::getSingleton('Mage_Backend_Model_Session')->getMessages(false)->getErrors();
+ $this->assertCount(1, $errorMessage);
+ $this->assertEquals('Incorrect CAPTCHA.', current($errorMessage)->getCode());
+ }
}

0 comments on commit a310c82

Please sign in to comment.
Something went wrong with that request. Please try again.