MAGETWO-56063: After upgrading from 2.0.7 to 2.1, editing a category gives a 500 error (d46494bb) · Commits · KIII-12 / Magento

Commit d46494bb authored 8 years ago by

Olga Kopylova

MAGETWO-56063: After upgrading from 2.0.7 to 2.1, editing a category gives a 500 error

Merge remote-tracking branch 'mainline/develop' into MAGETWO-56063-upgrade-from-2.0.7-to-2.1.0

parents 8693a81f 2842e92f

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/etc/adminhtml/system.xml 1 addition, 1 deletion

app/code/Magento/Backend/etc/adminhtml/system.xml
app/code/Magento/Braintree/etc/adminhtml/system.xml 2 additions, 2 deletions

app/code/Magento/Braintree/etc/adminhtml/system.xml
app/code/Magento/Braintree/view/adminhtml/web/styles.css 2 additions, 2 deletions

app/code/Magento/Braintree/view/adminhtml/web/styles.css
app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml 2 additions, 2 deletions

.../frontend/templates/product/widget/link/link_inline.phtml
app/code/Magento/CatalogImportExport/Model/Import/Product.php 39 additions, 1 deletion

...code/Magento/CatalogImportExport/Model/Import/Product.php
app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php 9 additions, 0 deletions

...ogImportExport/Model/Import/Product/Type/AbstractType.php
app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml 2 additions, 2 deletions

...Cms/view/frontend/templates/widget/link/link_inline.phtml
app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php 5 additions, 1 deletion

...to/ConfigurableProduct/Model/Product/VariationHandler.php
app/code/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox.php 60 additions, 0 deletions

...ento/ConfigurableProduct/Pricing/Render/FinalPriceBox.php
app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/VariationHandlerTest.php 44 additions, 15 deletions

...eProduct/Test/Unit/Model/Product/VariationHandlerTest.php
app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Render/FinalPriceBoxTest.php 137 additions, 0 deletions

...bleProduct/Test/Unit/Pricing/Render/FinalPriceBoxTest.php
app/code/Magento/ConfigurableProduct/view/base/layout/catalog_product_prices.xml 21 additions, 0 deletions

...urableProduct/view/base/layout/catalog_product_prices.xml
app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml 60 additions, 0 deletions

...oduct/view/base/templates/product/price/final_price.phtml
app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js 20 additions, 1 deletion

.../ConfigurableProduct/view/frontend/web/js/configurable.js
app/code/Magento/Customer/Model/Customer/DataProvider.php 74 additions, 1 deletion

app/code/Magento/Customer/Model/Customer/DataProvider.php
app/code/Magento/Customer/Model/Plugin/AllowedCountries.php 65 additions, 0 deletions

app/code/Magento/Customer/Model/Plugin/AllowedCountries.php
app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php 29 additions, 1 deletion

.../Model/ResourceModel/Address/Attribute/Source/Country.php
app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php 117 additions, 0 deletions

...rceModel/Address/Attribute/Source/CountryWithWebsites.php
app/code/Magento/Customer/Setup/UpgradeData.php 143 additions, 0 deletions

app/code/Magento/Customer/Setup/UpgradeData.php
app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php 97 additions, 3 deletions

...to/Customer/Test/Unit/Model/Customer/DataProviderTest.php

with 929 additions and 32 deletions

Please register or to comment

Admin message

MAGETWO-56063: After upgrading from 2.0.7 to 2.1, editing a category gives a 500 error