Permalink
Browse files

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
  • Loading branch information...
1 parent 37bf8f2 commit f1494386a6e21928ecc688b9bfe91112ff8f6fab @magento-team magento-team committed Aug 27, 2012
Showing with 6,147 additions and 1,890 deletions.
  1. +1 −0 .gitignore
  2. +22 −0 CHANGELOG.markdown
  3. +0 −16 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php
  4. +0 −122 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php
  5. +0 −8 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php
  6. +0 −23 app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
  7. +200 −369 app/code/core/Mage/Adminhtml/controllers/CustomerController.php
  8. +2 −5 app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php
  9. +0 −3 app/code/core/Mage/Adminhtml/etc/config.xml
  10. +0 −12 app/code/core/Mage/Adminhtml/view/adminhtml/catalog.xml
  11. +0 −12 app/code/core/Mage/Adminhtml/view/adminhtml/customer.xml
  12. +1 −1 app/code/core/Mage/Adminhtml/view/adminhtml/notification/toolbar.phtml
  13. +50 −6 app/code/core/Mage/Catalog/Helper/Product/View.php
  14. +10 −0 app/code/core/Mage/Catalog/etc/config.xml
  15. +1 −3 app/code/core/Mage/CatalogSearch/view/frontend/result.phtml
  16. +2 −1 app/code/core/Mage/Core/Helper/Js.php
  17. +23 −0 app/code/core/Mage/DesignEditor/Block/Template.php
  18. +14 −1 app/code/core/Mage/DesignEditor/Block/Toolbar.php
  19. +61 −0 app/code/core/Mage/DesignEditor/Block/Toolbar/Buttons.php
  20. +5 −5 app/code/core/Mage/DesignEditor/Block/Toolbar/{Exit.php → History.php}
  21. +43 −0 app/code/core/Mage/DesignEditor/Block/Wrapper/Remove.php
  22. +143 −0 app/code/core/Mage/DesignEditor/Model/History.php
  23. +83 −0 app/code/core/Mage/DesignEditor/Model/History/Manager.php
  24. +58 −0 app/code/core/Mage/DesignEditor/Model/History/Manager/Adapter.php
  25. +76 −0 app/code/core/Mage/DesignEditor/Model/History/Manager/Adapter/Abstract.php
  26. +187 −0 app/code/core/Mage/DesignEditor/Model/History/Manager/Adapter/Layout.php
  27. +166 −0 app/code/core/Mage/DesignEditor/Model/History/Manager/Collection.php
  28. +12 −7 app/code/core/Mage/DesignEditor/Model/Observer.php
  29. +57 −1 app/code/core/Mage/DesignEditor/controllers/EditorController.php
  30. +38 −0 app/code/core/Mage/DesignEditor/etc/jstranslator.xml
  31. +42 −4 app/code/core/Mage/DesignEditor/view/frontend/css/styles.css
  32. +136 −136 app/code/core/Mage/DesignEditor/view/frontend/js/base.js
  33. +67 −0 app/code/core/Mage/DesignEditor/view/frontend/js/change/history.js
  34. +333 −0 app/code/core/Mage/DesignEditor/view/frontend/js/change/layout.js
  35. +536 −181 app/code/core/Mage/DesignEditor/view/frontend/js/design_editor.js
  36. +3 −1 app/code/core/Mage/DesignEditor/view/frontend/layout.xml
  37. +26 −24 app/code/core/Mage/DesignEditor/view/frontend/toolbar.phtml
  38. +39 −0 app/code/core/Mage/DesignEditor/view/frontend/toolbar/buttons.phtml
  39. +4 −4 app/code/core/Mage/DesignEditor/view/frontend/toolbar/{exit.phtml → history.phtml}
  40. +32 −0 app/code/core/Mage/DesignEditor/view/frontend/wrapper/remove.phtml
  41. +6 −3 app/code/core/Mage/DesignEditor/view/frontend/wrapping.phtml
  42. +0 −15 app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php
  43. +0 −1 app/code/core/Mage/Page/etc/config.xml
  44. +0 −5 app/code/core/Mage/Reports/etc/adminhtml/acl.xml
  45. +0 −47 app/code/core/Mage/Rss/Helper/Catalog.php
  46. +0 −17 app/code/core/Mage/Rss/controllers/CatalogController.php
  47. +0 −9 app/code/core/Mage/Rss/etc/system.xml
  48. +0 −6 app/code/core/Mage/Rss/view/frontend/layout.xml
  49. +1 −0 app/code/core/Mage/Sales/view/email/order_new.html
  50. +14 −14 app/code/core/Mage/{Adminhtml/Block/Tag → Tag/Block/Adminhtml}/Assigned/Grid.php
  51. +164 −0 app/code/core/Mage/Tag/Block/Adminhtml/Catalog/Product/Edit/Tab/Tag.php
  52. +164 −0 app/code/core/Mage/Tag/Block/Adminhtml/Catalog/Product/Edit/Tab/Tag/Customer.php
  53. +24 −23 ...t/Edit/Tab/Tag/Customer.php → Tag/Block/Adminhtml/Catalog/Product/Edit/Tab/Tag/Customer/Grid.php}
  54. +11 −11 ...ock/Catalog/Product/Edit/Tab/Tag.php → Tag/Block/Adminhtml/Catalog/Product/Edit/Tab/Tag/Grid.php}
  55. +4 −4 app/code/core/Mage/{Adminhtml/Block/Tag → Tag/Block/Adminhtml}/Customer.php
  56. +163 −0 app/code/core/Mage/Tag/Block/Adminhtml/Customer/Edit/Tab/Tag.php
  57. +65 −32 .../{Adminhtml/Block/Customer/Edit/Tab/Tag.php → Tag/Block/Adminhtml/Customer/Edit/Tab/Tag/Grid.php}
  58. +5 −5 app/code/core/Mage/{Adminhtml/Block/Tag → Tag/Block/Adminhtml}/Customer/Grid.php
  59. +10 −9 app/code/core/Mage/{Adminhtml/Block/Tag → Tag/Block/Adminhtml}/Edit.php
  60. +3 −3 app/code/core/Mage/{Adminhtml/Block/Tag → Tag/Block/Adminhtml}/Edit/Accordion.php
  61. +3 −3 app/code/core/Mage/{Adminhtml/Block/Tag → Tag/Block/Adminhtml}/Edit/Assigned.php
  62. +6 −6 app/code/core/Mage/{Adminhtml/Block/Tag → Tag/Block/Adminhtml}/Edit/Form.php
  63. +4 −4 app/code/core/Mage/{Adminhtml/Block/Tag → Tag/Block/Adminhtml}/Grid/All.php
  64. +3 −3 app/code/core/Mage/{Adminhtml/Block/Tag → Tag/Block/Adminhtml}/Grid/Pending.php
  65. +4 −4 app/code/core/Mage/{Adminhtml/Block/Tag → Tag/Block/Adminhtml}/Pending.php
  66. +4 −4 app/code/core/Mage/{Adminhtml/Block/Tag → Tag/Block/Adminhtml}/Product.php
  67. +6 −6 app/code/core/Mage/{Adminhtml/Block/Tag → Tag/Block/Adminhtml}/Product/Grid.php
  68. +7 −7 app/code/core/Mage/{Adminhtml/Block/Report/Tag → Tag/Block/Adminhtml/Report}/Customer.php
  69. +7 −8 app/code/core/Mage/{Adminhtml/Block/Report/Tag → Tag/Block/Adminhtml/Report}/Customer/Detail.php
  70. +11 −12 ...code/core/Mage/{Adminhtml/Block/Report/Tag → Tag/Block/Adminhtml/Report}/Customer/Detail/Grid.php
  71. +13 −14 app/code/core/Mage/{Adminhtml/Block/Report/Tag → Tag/Block/Adminhtml/Report}/Customer/Grid.php
  72. +7 −7 app/code/core/Mage/{Adminhtml/Block/Report/Tag → Tag/Block/Adminhtml/Report}/Popular.php
  73. +7 −9 app/code/core/Mage/{Adminhtml/Block/Report/Tag → Tag/Block/Adminhtml/Report}/Popular/Detail.php
  74. +14 −15 app/code/core/Mage/{Adminhtml/Block/Report/Tag → Tag/Block/Adminhtml/Report}/Popular/Detail/Grid.php
  75. +11 −13 app/code/core/Mage/{Adminhtml/Block/Report/Tag → Tag/Block/Adminhtml/Report}/Popular/Grid.php
  76. +7 −7 app/code/core/Mage/{Adminhtml/Block/Report/Tag → Tag/Block/Adminhtml/Report}/Product.php
  77. +7 −7 app/code/core/Mage/{Adminhtml/Block/Report/Tag → Tag/Block/Adminhtml/Report}/Product/Detail.php
  78. +11 −12 app/code/core/Mage/{Adminhtml/Block/Report/Tag → Tag/Block/Adminhtml/Report}/Product/Detail/Grid.php
  79. +14 −15 app/code/core/Mage/{Adminhtml/Block/Report/Tag → Tag/Block/Adminhtml/Report}/Product/Grid.php
  80. +3 −3 app/code/core/Mage/{Adminhtml/Block/Tag → Tag/Block/Adminhtml}/Store/Switcher.php
  81. +6 −5 app/code/core/Mage/{Adminhtml/Block/Tag → Tag/Block/Adminhtml}/Tag.php
  82. +3 −3 app/code/core/Mage/{Adminhtml/Block/Tag → Tag/Block/Adminhtml}/Tag/Grid.php
  83. +9 −8 app/code/core/Mage/{Rss/Block/Catalog/Tag.php → Tag/Block/Catalog/Product/Rss.php}
  84. +114 −0 app/code/core/Mage/Tag/Block/Catalog/Product/Rss/Link.php
  85. +5 −6 app/code/core/Mage/{Reports/Model/Resource/Tag → Tag/Model/Resource/Reports}/Collection.php
  86. +4 −5 app/code/core/Mage/{Reports/Model/Resource/Tag → Tag/Model/Resource/Reports}/Customer/Collection.php
  87. +12 −13 app/code/core/Mage/{Reports/Model/Resource/Tag → Tag/Model/Resource/Reports}/Product/Collection.php
  88. +58 −0 app/code/core/Mage/Tag/controllers/Adminhtml/Catalog/ProductController.php
  89. +91 −0 app/code/core/Mage/Tag/controllers/Adminhtml/CustomerController.php
  90. +79 −44 app/code/core/Mage/{Adminhtml/controllers → Tag/controllers/Adminhtml}/Report/TagController.php
  91. +44 −18 app/code/core/Mage/{Adminhtml/controllers → Tag/controllers/Adminhtml}/TagController.php
  92. +19 −17 app/code/core/Mage/Tag/controllers/IndexController.php
  93. +60 −0 app/code/core/Mage/Tag/controllers/Rss/CatalogController.php
  94. +7 −0 app/code/core/Mage/Tag/etc/adminhtml/acl.xml
  95. +46 −0 app/code/core/Mage/Tag/etc/config.xml
  96. +48 −0 app/code/core/Mage/Tag/etc/system.xml
  97. +49 −0 app/code/core/Mage/Tag/view/adminhtml/customer.xml
  98. +50 −0 app/code/core/Mage/Tag/view/adminhtml/product.xml
  99. +9 −9 app/code/core/Mage/{Adminhtml → Tag}/view/adminhtml/tag.xml
  100. 0 app/code/core/Mage/{Adminhtml → Tag}/view/adminhtml/tag/edit/container.phtml
  101. 0 app/code/core/Mage/{Adminhtml → Tag}/view/adminhtml/tag/index.phtml
  102. +1 −0 app/code/core/Mage/Tag/view/frontend/layout.xml
  103. +30 −0 app/code/core/Mage/Tag/view/frontend/product/rss/link.phtml
  104. +38 −0 app/code/core/Mage/Tag/view/frontend/rss.xml
  105. +0 −1 app/design/frontend/default/iphone/Mage_Catalog/product/view.phtml
  106. +1 −3 app/design/frontend/default/iphone/Mage_CatalogSearch/result.phtml
  107. +0 −6 app/design/frontend/default/iphone/Mage_Rss/layout.xml
  108. +1 −0 app/design/frontend/default/iphone/Mage_Tag/layout.xml
  109. +0 −4 app/design/frontend/default/modern/Mage_Rss/layout.xml
  110. +1 −0 app/design/frontend/default/modern/Mage_Tag/layout.xml
  111. +2 −8 dev/tests/integration/testsuite/Mage/Adminhtml/controllers/CustomerControllerTest.php
  112. +7 −0 dev/tests/integration/testsuite/Mage/Adminhtml/controllers/Sales/OrderControllerTest.php
  113. +2 −2 dev/tests/integration/testsuite/Mage/Catalog/Helper/Product/CompareTest.php
  114. +43 −2 dev/tests/integration/testsuite/Mage/Catalog/Helper/Product/ViewTest.php
  115. +3 −3 dev/tests/integration/testsuite/Mage/Catalog/Model/Product/Type/AbstractTest.php
  116. +1 −1 dev/tests/integration/testsuite/Mage/Catalog/Model/ProductTest.php
  117. +49 −7 dev/tests/integration/testsuite/Mage/Catalog/_files/{two_products.php → multiple_products.php}
  118. +2 −2 dev/tests/integration/testsuite/Mage/DesignEditor/Block/Toolbar/ExitTest.php
  119. +178 −0 dev/tests/integration/testsuite/Mage/DesignEditor/Model/HistoryTest.php
  120. +36 −8 dev/tests/integration/testsuite/Mage/DesignEditor/Model/ObserverTest.php
  121. +36 −0 dev/tests/integration/testsuite/Mage/DesignEditor/_files/history/compact_log.xml
  122. +0 −196 dev/tests/integration/testsuite/Mage/ImportExport/Model/Import/Entity/CustomerCompositeTest.php
  123. +114 −0 dev/tests/integration/testsuite/Mage/ImportExport/Model/Import/Entity/Product/Type/AbstractTest.php
  124. +79 −0 dev/tests/integration/testsuite/Mage/ImportExport/Model/Import/Entity/ProductTest.php
  125. +0 −2 .../integration/testsuite/Mage/ImportExport/Model/Import/Entity/_files/customer_composite_delete.csv
  126. +0 −7 .../integration/testsuite/Mage/ImportExport/Model/Import/Entity/_files/customer_composite_update.csv
  127. +4 −0 dev/tests/integration/testsuite/Mage/ImportExport/Model/Import/Entity/_files/products_to_import.csv
  128. +0 −1 dev/tests/integration/testsuite/Mage/Page/_files/robots.txt
  129. +1 −1 dev/tests/integration/testsuite/Mage/Review/_files/reviews.php
  130. +3 −2 dev/tests/integration/testsuite/Mage/Rss/controllers/CatalogControllerTest.php
  131. +30 −0 dev/tests/js/testsuite/mage/design_editor/historyTest.js
  132. +31 −0 dev/tests/js/testsuite/mage/design_editor/historyToolbarTest.js
  133. +230 −186 dev/tests/js/testsuite/mage/design_editor/pageTest.js
  134. +42 −0 dev/tests/performance/framework/Magento/Scenario.php
  135. +4 −0 dev/tests/performance/framework/tests/unit/testsuite/Magento/ConfigTest.php
  136. +27 −0 dev/tests/performance/framework/tests/unit/testsuite/Magento/ScenarioTest.php
  137. +29 −0 dev/tests/performance/framework/tests/unit/testsuite/Magento/_files/scenario_with_scripts.jmx
  138. +37 −0 dev/tests/performance/framework/tests/unit/testsuite/Magento/_files/scenario_with_scripts.jtl
  139. +28 −0 dev/tests/performance/framework/tests/unit/testsuite/Magento/_files/scenario_with_scripts_after.php
  140. +28 −0 dev/tests/performance/framework/tests/unit/testsuite/Magento/_files/scenario_with_scripts_before.php
  141. 0 dev/tests/performance/testsuite/{_samples → }/add_to_cart.jmx
  142. +13 −6 dev/tests/performance/testsuite/advanced_search.jmx
  143. 0 dev/tests/performance/testsuite/{_samples → }/checkout.jmx
  144. +49 −0 dev/tests/performance/testsuite/checkout_after.php
  145. +33 −0 dev/tests/performance/testsuite/checkout_before.php
  146. 0 dev/tests/performance/testsuite/{_samples → }/product_edit.jmx
  147. +2 −1 dev/tests/static/testsuite/Legacy/_files/obsolete_methods.php
  148. +2 −0 dev/tests/static/testsuite/Php/_files/whitelist/core.txt
  149. +4 −4 dev/tests/unit/framework/bootstrap.php
  150. +226 −0 dev/tests/unit/testsuite/Mage/DesignEditor/Model/HistoryTest.php
  151. +105 −0 dev/tests/unit/testsuite/Mage/DesignEditor/Model/Manager/Adapter/LayoutTest.php
  152. +31 −0 dev/tests/unit/testsuite/Mage/DesignEditor/Model/_files/history/layout/move.xml
  153. +31 −0 dev/tests/unit/testsuite/Mage/DesignEditor/Model/_files/history/layout/remove.xml
  154. +55 −0 dev/tests/unit/testsuite/Mage/Tag/Block/Adminhtml/Catalog/Product/Edit/Tab/Tag/CustomerTest.php
  155. +56 −0 dev/tests/unit/testsuite/Mage/Tag/Block/Adminhtml/Catalog/Product/Edit/Tab/TagTest.php
  156. +135 −0 dev/tests/unit/testsuite/Mage/Tag/Block/Adminhtml/Catalog/Product/Edit/Tab/TagTestCaseAbstract.php
  157. +192 −0 dev/tests/unit/testsuite/Mage/Tag/Block/Adminhtml/Customer/Edit/Tab/TagTest.php
  158. +121 −0 dev/tests/unit/testsuite/Mage/Tag/Block/Catalog/Product/Rss/LinkTest.php
  159. +1 −1 dev/tests/unit/testsuite/tools/migration/Acl/Db/Logger/ConsoleTest.php
  160. +4 −0 lib/Varien/Db/Adapter/Pdo/Mysql.php
View
@@ -4,6 +4,7 @@
/.metadata
/.project
/.settings
+atlassian*
/index.php
/nbproject
/sitemap
View
@@ -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:
@@ -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',
- ));
- }
- }
-
}
/**
@@ -1,122 +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_Adminhtml
- * @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)
- */
-
-/**
- * Adminhtml customer orders grid block
- *
- * @category Mage
- * @package Mage_Adminhtml
- * @author Magento Core Team <core@magentocommerce.com>
- */
-class Mage_Adminhtml_Block_Customer_Edit_Tab_Tags extends Mage_Adminhtml_Block_Widget_Grid
-{
-
- public function __construct()
- {
- parent::__construct();
- $this->setId('ordersGrid');
- $this->setUseAjax(true);
- }
-
- protected function _prepareCollection()
- {
- $collection = Mage::getResourceModel('Mage_Customer_Model_Resource_Customer_Collection')
- ->addNameToSelect()
- ->addAttributeToSelect('email')
- ->addAttributeToSelect('created_at')
- ->joinAttribute('billing_postcode', 'customer_address/postcode', 'default_billing')
- ->joinAttribute('billing_city', 'customer_address/city', 'default_billing')
- ->joinAttribute('billing_telephone', 'customer_address/telephone', 'default_billing')
- ->joinAttribute('billing_country_id', 'customer_address/country_id', 'default_billing');
-
- $this->setCollection($collection);
-
- return parent::_prepareCollection();
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('entity_id', array(
- 'header' => Mage::helper('Mage_Customer_Helper_Data')->__('ID'),
- 'width' =>5,
- 'align' =>'center',
- 'sortable' =>true,
- 'index' =>'entity_id'
- ));
- $this->addColumn('name', array(
- 'header' => Mage::helper('Mage_Customer_Helper_Data')->__('Name'),
- 'index' =>'name'
- ));
- $this->addColumn('email', array(
- 'header' => Mage::helper('Mage_Customer_Helper_Data')->__('Email'),
- 'width' =>40,
- 'align' =>'center',
- 'index' =>'email'
- ));
- $this->addColumn('telephone', array(
- 'header' => Mage::helper('Mage_Customer_Helper_Data')->__('Telephone'),
- 'align' =>'center',
- 'index' =>'billing_telephone'
- ));
- $this->addColumn('billing_postcode', array(
- 'header' => Mage::helper('Mage_Customer_Helper_Data')->__('ZIP/Post Code'),
- 'index' =>'billing_postcode',
- ));
- $this->addColumn('billing_country_id', array(
- 'header' => Mage::helper('Mage_Customer_Helper_Data')->__('Country'),
- 'type' => 'country',
- 'index' => 'billing_country_id',
- ));
- $this->addColumn('customer_since', array(
- 'header' => Mage::helper('Mage_Customer_Helper_Data')->__('Customer Since'),
- 'type' => 'date',
- 'format' => 'Y.m.d',
- 'index' =>'created_at',
- ));
- $this->addColumn('action', array(
- 'header' => Mage::helper('Mage_Customer_Helper_Data')->__('Action'),
- 'align' =>'center',
- 'format' =>'<a href="'.$this->getUrl('*/sales/edit/id/$entity_id').'">'.Mage::helper('Mage_Customer_Helper_Data')->__('Edit').'</a>',
- 'filter' =>false,
- 'sortable' =>false,
- 'is_system' =>true
- ));
-
- $this->setColumnFilter('entity_id')
- ->setColumnFilter('email')
- ->setColumnFilter('name');
-
- $this->addExportType('*/*/exportCsv', Mage::helper('Mage_Customer_Helper_Data')->__('CSV'));
- $this->addExportType('*/*/exportXml', Mage::helper('Mage_Customer_Helper_Data')->__('Excel XML'));
- return parent::_prepareColumns();
- }
-
- public function getGridUrl()
- {
- return $this->getUrl('*/*/index', array('_current'=>true));
- }
-
-}
@@ -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();
@@ -810,17 +810,6 @@ public function deleteAction()
}
/**
- * 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
*/
public function alertsPriceGridAction()
@@ -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();
Oops, something went wrong.

0 comments on commit f149438

Please sign in to comment.