Skip to content

Commit f149438

Browse files
committed
Update as of 8/26/2012
* Decoupled Tag module functionality from other modules * Visual Design Editor: * Implemented tracking of user changes history and rendering the actions at VDE toolbar * Implemented compacting of user changes history. Compacting is done in order to save all the changes as a minimal layout update. * Improvements: * Added Atlassian IDE Plugin configuration files to `.gitignore` * Relocated `add_to_cart`, `checkout` and `product_edit` performance scenarios from `samples` to the normal `testsuite` directory. These scenarios can be used for Magento performance testing. * Implemented verification of number of orders that were created during execution of `checkout` performance scenario * Removed usage of deprecated `PHPUnit_Extensions_OutputTestCase` class from unit tests * Fixes: * Fixed MySQL DB adapter to always throw exception, if it was not able to connect to DB because of wrong configuration. So now the adapter's behavior is not dependent on `error_reporting` settings. * Added the missing closing tag to New Order email template * Fixed `Mage_ImportExport_Model_Import_Entity_CustomerComposite` integration test issues * Marked several integration tests in `Mage_Adminhtml_CustomerControllerTest` as incomplete, as the tested functionality was not MMDB-compliant * Fixed issue with unit tests failure, when there was a Zend Framework installed as PEAR package * Fixed `advanced_search` performance scenario to fail, if the searched product doesn't exist * Fixed issue with non-escaped latest message link in admin backend * GitHub requests: * [#48](#48) -- fixed usage of a collection at the place, where just a single object was needed
1 parent 37bf8f2 commit f149438

File tree

159 files changed

+6114
-1857
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+6114
-1857
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
/.metadata
55
/.project
66
/.settings
7+
atlassian*
78
/index.php
89
/nbproject
910
/sitemap

CHANGELOG.markdown

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
Update as of 8/26/2012
2+
======================
3+
* Decoupled Tag module functionality from other modules
4+
* Visual Design Editor:
5+
* Implemented tracking of user changes history and rendering the actions at VDE toolbar
6+
* Implemented compacting of user changes history. Compacting is done in order to save all the changes as a minimal layout update.
7+
* Improvements:
8+
* Added Atlassian IDE Plugin configuration files to `.gitignore`
9+
* Relocated `add_to_cart`, `checkout` and `product_edit` performance scenarios from `samples` to the normal `testsuite` directory. These scenarios can be used for Magento performance testing.
10+
* Implemented verification of number of orders that were created during execution of `checkout` performance scenario
11+
* Removed usage of deprecated `PHPUnit_Extensions_OutputTestCase` class from unit tests
12+
* Fixes:
13+
* Fixed MySQL DB adapter to always throw exception, if it was not able to connect to DB because of wrong configuration. So now the adapter's behavior is not dependent on `error_reporting` settings.
14+
* Added the missing closing tag to New Order email template
15+
* Fixed `Mage_ImportExport_Model_Import_Entity_CustomerComposite` integration test issues
16+
* Marked several integration tests in `Mage_Adminhtml_CustomerControllerTest` as incomplete, as the tested functionality was not MMDB-compliant
17+
* Fixed issue with unit tests failure, when there was a Zend Framework installed as PEAR package
18+
* Fixed `advanced_search` performance scenario to fail, if the searched product doesn't exist
19+
* Fixed issue with non-escaped latest message link in admin backend
20+
* GitHub requests:
21+
* [#48](https://github.com/magento/magento2/pull/48) -- fixed usage of a collection at the place, where just a single object was needed
22+
123
Update as of 8/15/2012
224
======================
325
* Refactored ACL functionality:

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -154,22 +154,6 @@ protected function _prepareLayout()
154154
));
155155
}
156156
}
157-
if (Mage::helper('Mage_Catalog_Helper_Data')->isModuleEnabled('Mage_Tag')) {
158-
if (Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Tag::tag')){
159-
$this->addTab('tags', array(
160-
'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Product Tags'),
161-
'url' => $this->getUrl('*/*/tagGrid', array('_current' => true)),
162-
'class' => 'ajax',
163-
));
164-
165-
$this->addTab('customers_tags', array(
166-
'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Customers Tagged Product'),
167-
'url' => $this->getUrl('*/*/tagCustomerGrid', array('_current' => true)),
168-
'class' => 'ajax',
169-
));
170-
}
171-
}
172-
173157
}
174158

175159
/**

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php

Lines changed: 0 additions & 122 deletions
This file was deleted.

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,6 @@ protected function _beforeToHtml()
108108
'url' => $this->getUrl('*/*/productReviews', array('_current' => true)),
109109
));
110110
}
111-
112-
if (Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Tag::tag')) {
113-
$this->addTab('tags', array(
114-
'label' => Mage::helper('Mage_Customer_Helper_Data')->__('Product Tags'),
115-
'class' => 'ajax',
116-
'url' => $this->getUrl('*/*/productTags', array('_current' => true)),
117-
));
118-
}
119111
}
120112

121113
$this->_updateActiveTab();

app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -809,17 +809,6 @@ public function deleteAction()
809809
->setRedirect($this->getUrl('*/*/', array('store'=>$this->getRequest()->getParam('store'))));
810810
}
811811

812-
/**
813-
* Get tag grid
814-
*/
815-
public function tagGridAction()
816-
{
817-
$this->loadLayout();
818-
$this->getLayout()->getBlock('admin.product.tags')
819-
->setProductId($this->getRequest()->getParam('id'));
820-
$this->renderLayout();
821-
}
822-
823812
/**
824813
* Get alerts price grid
825814
*/
@@ -936,18 +925,6 @@ public function _validateMassStatus(array $productIds, $status)
936925
}
937926
}
938927

939-
/**
940-
* Get tag customer grid
941-
*
942-
*/
943-
public function tagCustomerGridAction()
944-
{
945-
$this->loadLayout();
946-
$this->getLayout()->getBlock('admin.product.tags.customers')
947-
->setProductId($this->getRequest()->getParam('id'));
948-
$this->renderLayout();
949-
}
950-
951928
public function quickCreateAction()
952929
{
953930
$result = array();

0 commit comments

Comments
 (0)