Skip to content

Commit

Permalink
Update as of 8/26/2012
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
magento-team committed Aug 27, 2012
1 parent 37bf8f2 commit f149438
Show file tree
Hide file tree
Showing 159 changed files with 6,114 additions and 1,857 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/.metadata
/.project
/.settings
atlassian*
/index.php
/nbproject
/sitemap
Expand Down
22 changes: 22 additions & 0 deletions CHANGELOG.markdown
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
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](https://github.com/magento/magento2/pull/48) -- fixed usage of a collection at the place, where just a single object was needed

Update as of 8/15/2012
======================
* Refactored ACL functionality:
Expand Down
16 changes: 0 additions & 16 deletions app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php
Original file line number Diff line number Diff line change
Expand Up @@ -154,22 +154,6 @@ protected function _prepareLayout()
));
}
}
if (Mage::helper('Mage_Catalog_Helper_Data')->isModuleEnabled('Mage_Tag')) {
if (Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Tag::tag')){
$this->addTab('tags', array(
'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Product Tags'),
'url' => $this->getUrl('*/*/tagGrid', array('_current' => true)),
'class' => 'ajax',
));

$this->addTab('customers_tags', array(
'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Customers Tagged Product'),
'url' => $this->getUrl('*/*/tagCustomerGrid', array('_current' => true)),
'class' => 'ajax',
));
}
}

}

/**
Expand Down
122 changes: 0 additions & 122 deletions app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php

This file was deleted.

8 changes: 0 additions & 8 deletions app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,6 @@ protected function _beforeToHtml()
'url' => $this->getUrl('*/*/productReviews', array('_current' => true)),
));
}

if (Mage::getSingleton('Mage_Core_Model_Authorization')->isAllowed('Mage_Tag::tag')) {
$this->addTab('tags', array(
'label' => Mage::helper('Mage_Customer_Helper_Data')->__('Product Tags'),
'class' => 'ajax',
'url' => $this->getUrl('*/*/productTags', array('_current' => true)),
));
}
}

$this->_updateActiveTab();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -809,17 +809,6 @@ public function deleteAction()
->setRedirect($this->getUrl('*/*/', array('store'=>$this->getRequest()->getParam('store'))));
}

/**
* Get tag grid
*/
public function tagGridAction()
{
$this->loadLayout();
$this->getLayout()->getBlock('admin.product.tags')
->setProductId($this->getRequest()->getParam('id'));
$this->renderLayout();
}

/**
* Get alerts price grid
*/
Expand Down Expand Up @@ -936,18 +925,6 @@ public function _validateMassStatus(array $productIds, $status)
}
}

/**
* Get tag customer grid
*
*/
public function tagCustomerGridAction()
{
$this->loadLayout();
$this->getLayout()->getBlock('admin.product.tags.customers')
->setProductId($this->getRequest()->getParam('id'));
$this->renderLayout();
}

public function quickCreateAction()
{
$result = array();
Expand Down
Loading

0 comments on commit f149438

Please sign in to comment.