Skip to content

Commit bf8953d

Browse files
author
Bohdan Korablov
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-58658
2 parents cf66ebc + 2c22ac4 commit bf8953d

File tree

73 files changed

+630
-67
lines changed

Some content is hidden

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

73 files changed

+630
-67
lines changed

app/code/Magento/Backend/Block/Widget/Form/Container.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,16 @@ class Container extends \Magento\Backend\Block\Widget\Container
3737
* @var string
3838
*/
3939
protected $_blockGroup = 'Magento_Backend';
40+
41+
/**
42+
* @var string
43+
*/
44+
const PARAM_BLOCK_GROUP = 'block_group';
45+
46+
/**
47+
* @var string
48+
*/
49+
const PARAM_MODE = 'mode';
4050

4151
/**
4252
* @var string
@@ -49,6 +59,12 @@ class Container extends \Magento\Backend\Block\Widget\Container
4959
protected function _construct()
5060
{
5161
parent::_construct();
62+
if ($this->hasData(self::PARAM_BLOCK_GROUP)) {
63+
$this->_blockGroup = $this->_getData(self::PARAM_BLOCK_GROUP);
64+
}
65+
if ($this->hasData(self::PARAM_MODE)) {
66+
$this->_mode = $this->_getData(self::PARAM_MODE);
67+
}
5268

5369
$this->addButton(
5470
'back',

app/code/Magento/Catalog/Model/Product.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2274,7 +2274,7 @@ public function getIdentities()
22742274
$identities[] = self::CACHE_PRODUCT_CATEGORY_TAG . '_' . $categoryId;
22752275
}
22762276
}
2277-
2277+
22782278
if (($this->getOrigData('status') != $this->getData('status')) || $this->isStockStatusChanged()) {
22792279
foreach ($this->getCategoryIds() as $categoryId) {
22802280
$identities[] = self::CACHE_PRODUCT_CATEGORY_TAG . '_' . $categoryId;
@@ -2289,7 +2289,7 @@ public function getIdentities()
22892289

22902290
/**
22912291
* Check whether stock status changed
2292-
*
2292+
*
22932293
* @return bool
22942294
*/
22952295
private function isStockStatusChanged()
@@ -2307,7 +2307,7 @@ private function isStockStatusChanged()
23072307
&& ($stockItem->getIsInStock() != $stockData['is_in_stock'])
23082308
);
23092309
}
2310-
2310+
23112311
/**
23122312
* Reload PriceInfo object
23132313
*

app/code/Magento/CatalogWidget/Block/Product/ProductsList.php

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\CatalogWidget\Block\Product;
108

119
use Magento\Framework\DataObject\IdentityInterface;
1210
use Magento\Widget\Block\BlockInterface;
11+
use Magento\Framework\Pricing\PriceCurrencyInterface;
1312

1413
/**
1514
* Catalog Products List widget block
@@ -81,6 +80,11 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
8180
*/
8281
protected $conditionsHelper;
8382

83+
/**
84+
* @var PriceCurrencyInterface
85+
*/
86+
private $priceCurrency;
87+
8488
/**
8589
* @param \Magento\Catalog\Block\Product\Context $context
8690
* @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
@@ -144,6 +148,7 @@ public function getCacheKeyInfo()
144148

145149
return [
146150
'CATALOG_PRODUCTS_LIST_WIDGET',
151+
$this->getPriceCurrency()->getCurrencySymbol(),
147152
$this->_storeManager->getStore()->getId(),
148153
$this->_design->getDesignTheme()->getId(),
149154
$this->httpContext->getValue(\Magento\Customer\Model\Context::CONTEXT_GROUP),
@@ -351,4 +356,19 @@ public function getTitle()
351356
{
352357
return $this->getData('title');
353358
}
359+
360+
/**
361+
* @return PriceCurrencyInterface
362+
*
363+
* @deprecated
364+
*/
365+
private function getPriceCurrency()
366+
{
367+
if ($this->priceCurrency === null) {
368+
$this->priceCurrency = \Magento\Framework\App\ObjectManager::getInstance()
369+
->get(PriceCurrencyInterface::class);
370+
}
371+
return $this->priceCurrency;
372+
373+
}
354374
}

app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
1212
use Magento\Catalog\Model\Product\Visibility;
13+
use Magento\Framework\Pricing\PriceCurrencyInterface;
1314

1415
/**
1516
* Class ProductsListTest
@@ -72,6 +73,11 @@ class ProductsListTest extends \PHPUnit_Framework_TestCase
7273
*/
7374
protected $layout;
7475

76+
/**
77+
* @var PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject
78+
*/
79+
private $priceCurrency;
80+
7581
protected function setUp()
7682
{
7783
$this->collectionFactory =
@@ -105,11 +111,13 @@ protected function setUp()
105111
);
106112
$this->request = $arguments['context']->getRequest();
107113
$this->layout = $arguments['context']->getLayout();
114+
$this->priceCurrency = $this->getMock(PriceCurrencyInterface::class);
108115

109116
$this->productsList = $objectManagerHelper->getObject(
110117
\Magento\CatalogWidget\Block\Product\ProductsList::class,
111118
$arguments
112119
);
120+
$objectManagerHelper->setBackwardCompatibleProperty($this->productsList, 'priceCurrency', $this->priceCurrency);
113121
}
114122

115123
public function testGetCacheKeyInfo()
@@ -130,9 +138,11 @@ public function testGetCacheKeyInfo()
130138
$this->request->expects($this->once())->method('getParam')->with('page_number')->willReturn(1);
131139

132140
$this->request->expects($this->once())->method('getParams')->willReturn('request_params');
141+
$this->priceCurrency->expects($this->once())->method('getCurrencySymbol')->willReturn('$');
133142

134143
$cacheKey = [
135144
'CATALOG_PRODUCTS_LIST_WIDGET',
145+
'$',
136146
1,
137147
'blank',
138148
'context_group',

app/code/Magento/ConfigurableProduct/Model/LinkManagement.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function addChild($sku, $childSku)
103103
}
104104

105105
$childrenIds[] = $child->getId();
106-
$product->setAssociatedProductIds($childrenIds);
106+
$product->getExtensionAttributes()->setConfigurableProductLinks($childrenIds);
107107
$product->save();
108108
return true;
109109
}
@@ -132,7 +132,7 @@ public function removeChild($sku, $childSku)
132132
if (count($options) == count($ids)) {
133133
throw new NoSuchEntityException(__('Requested option doesn\'t exist'));
134134
}
135-
$product->addData(['associated_product_ids' => $ids]);
135+
$product->getExtensionAttributes()->setConfigurableProductLinks($ids);
136136
$product->save();
137137
return true;
138138
}

app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace Magento\ConfigurableProduct\Test\Unit\Model;
88

99
use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
10+
use Magento\ConfigurableProduct\Test\Unit\Model\Product\ProductExtensionAttributes;
1011

1112
/**
1213
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -162,7 +163,15 @@ public function testAddChild()
162163
->will(
163164
$this->returnValue([0 => [1, 2, 3]])
164165
);
165-
$configurable->expects($this->once())->method('__call')->with('setAssociatedProductIds', [[1, 2, 3, 999]]);
166+
167+
$extensionAttributes = $this->getMockBuilder(ProductExtensionAttributes::class)
168+
->setMethods(['setConfigurableProductLinks'])
169+
->disableOriginalConstructor()
170+
->getMockForAbstractClass();
171+
172+
$configurable->expects($this->once())->method('getExtensionAttributes')->willReturn($extensionAttributes);
173+
$extensionAttributes->expects($this->once())->method('setConfigurableProductLinks')->willReturnSelf();
174+
166175
$configurable->expects($this->once())->method('save');
167176

168177
$this->assertTrue(true, $this->object->addChild($productSku, $childSku));
@@ -206,7 +215,7 @@ public function testRemoveChild()
206215
$childSku = 'simple_10';
207216

208217
$product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
209-
->setMethods(['getTypeInstance', 'save', 'getTypeId', 'addData', '__wakeup'])
218+
->setMethods(['getTypeInstance', 'save', 'getTypeId', 'addData', '__wakeup', 'getExtensionAttributes'])
210219
->disableOriginalConstructor()
211220
->getMock();
212221

@@ -234,7 +243,14 @@ public function testRemoveChild()
234243
$productType->expects($this->once())->method('getUsedProducts')
235244
->will($this->returnValue([$option]));
236245

237-
$product->expects($this->once())->method('addData')->with(['associated_product_ids' => []]);
246+
$extensionAttributes = $this->getMockBuilder(ProductExtensionAttributes::class)
247+
->setMethods(['setConfigurableProductLinks'])
248+
->disableOriginalConstructor()
249+
->getMockForAbstractClass();
250+
251+
$product->expects($this->once())->method('getExtensionAttributes')->willReturn($extensionAttributes);
252+
$extensionAttributes->expects($this->once())->method('setConfigurableProductLinks')->willReturnSelf();
253+
238254
$product->expects($this->once())->method('save');
239255
$this->assertTrue($this->object->removeChild($productSku, $childSku));
240256
}

app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProducts.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ protected function prepareVariations()
284284
'sku' => $product->getSku(),
285285
'name' => $product->getName(),
286286
'qty' => $this->getProductStockQty($product),
287-
'price' => $currency->toCurrency(sprintf("%f", $price), ['display' => false]),
287+
'price' => $price,
288288
'price_string' => $currency->toCurrency(sprintf("%f", $price)),
289289
'price_currency' => $this->locator->getStore()->getBaseCurrency()->getCurrencySymbol(),
290290
'configurable_attribute' => $this->getJsonConfigurableAttributes($variationOptions),

app/code/Magento/Deploy/Console/Command/SetModeCommand.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
104104
throw new LocalizedException(__('Cannot switch into given mode "%1"', $toMode));
105105
}
106106
$output->writeln('Enabled ' . $toMode . ' mode.');
107+
108+
return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
107109
} catch (\Exception $e) {
108110
$output->writeln('<error>' . $e->getMessage() . '</error>');
109111
if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {

app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ define([
432432

433433
for (t = 0; t < thumbs.length; t++) {
434434
this._setThumbsIcon(thumbs.eq(t), t);
435-
this._checkForVideo(e, fotorama, t);
435+
this._checkForVideo(e, fotorama, t + 1);
436436
}
437437

438438
this.fotoramaItem.on('fotorama:showend', $.proxy(function (evt, fotoramaData) {

app/code/Magento/Widget/Test/Unit/Block/Adminhtml/Widget/Instance/Edit/Chooser/AbstractContainerTest.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,14 @@ protected function setUp()
103103
->disableOriginalConstructor()
104104
->getMock();
105105

106-
$this->escaperMock = $this->getMock(\Magento\Framework\Escaper::class, ['escapeHtml'], [], '', false);
106+
$this->escaperMock = $this->getMock(
107+
\Magento\Framework\Escaper::class,
108+
['escapeHtml', 'escapeHtmlAttr'],
109+
[],
110+
'',
111+
false
112+
);
113+
$this->escaperMock->expects($this->any())->method('escapeHtmlAttr')->willReturnArgument(0);
107114

108115
$this->contextMock = $this->getMockBuilder(\Magento\Backend\Block\Context::class)
109116
->setMethods(['getEventManager', 'getScopeConfig', 'getEscaper'])

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class CreateCmsBlockEntityTest extends AbstractCmsBlockEntityTest
2727
/* tags */
2828
const MVP = 'yes';
2929
const TEST_TYPE = 'extended_acceptance_test';
30+
const SEVERITY = 'S1';
3031
/* end tags */
3132

3233
/**

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Cms\Test\TestCase\CreateCmsBlockEntityTest" summary="Create CMS Block" ticketId="MAGETWO-25578">
1010
<variation name="CreateCmsBlockEntityTestVariation1">
11-
<data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
11+
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S1</data>
1212
<data name="cmsBlock/data/title" xsi:type="string">block_%isolation%</data>
1313
<data name="cmsBlock/data/identifier" xsi:type="string">identifier_%isolation%</data>
1414
<data name="cmsBlock/data/stores/dataset/option_0" xsi:type="string">All Store Views</data>
@@ -19,13 +19,13 @@
1919
<constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockOnCategoryPage" />
2020
</variation>
2121
<variation name="CreateCmsBlockEntityTestVariation2">
22+
<data name="tag" xsi:type="string">severity:S2</data>
2223
<data name="cmsBlock/data/title" xsi:type="string">block_%isolation%</data>
2324
<data name="cmsBlock/data/identifier" xsi:type="string">identifier_%isolation%</data>
2425
<data name="cmsBlock/data/stores/dataset/option_0" xsi:type="string">default</data>
2526
<data name="cmsBlock/data/is_active" xsi:type="string">No</data>
2627
<data name="cmsBlock/data/content" xsi:type="string">description_%isolation%</data>
2728
<constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockSuccessSaveMessage" />
28-
<constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockInGrid" />
2929
<constraint name="Magento\Cms\Test\Constraint\AssertCmsBlockNotOnCategoryPage" />
3030
</variation>
3131
</testCase>

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class CreateCmsPageEntityTest extends Injectable
2929
/* tags */
3030
const MVP = 'yes';
3131
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
32+
const SEVERITY = 'S1';
3233
/* end tags */
3334

3435
/**

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Cms\Test\TestCase\CreateCmsPageEntityTest" summary="Create Cms Page" ticketId="MAGETWO-25580">
1010
<variation name="CreateCmsPageEntityTestVariation1" summary="Create CMS Content Page" ticketId="MAGETWO-12399">
11+
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S1</data>
1112
<data name="fixtureType" xsi:type="string">cmsPage</data>
1213
<data name="data/is_active" xsi:type="string">Yes</data>
1314
<data name="data/title" xsi:type="string">NewCmsPage%isolation%</data>
1415
<data name="data/identifier" xsi:type="string">identifier-%isolation%</data>
1516
<data name="data/store_id" xsi:type="string">All Store Views</data>
1617
<data name="data/content/content" xsi:type="string">cms_page_text_content%isolation%</data>
17-
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
1818
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageSuccessSaveMessage" />
1919
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageInGrid" />
2020
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPagePreview" />
2121
</variation>
2222
<variation name="CreateCmsPageEntityTestVariation2" summary="Create page for default store view">
23+
<data name="tag" xsi:type="string">severity:S1</data>
2324
<data name="fixtureType" xsi:type="string">cmsPage</data>
2425
<data name="data/is_active" xsi:type="string">Yes</data>
2526
<data name="data/title" xsi:type="string">NewCmsPage%isolation%</data>
@@ -30,6 +31,7 @@
3031
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageForm" />
3132
</variation>
3233
<variation name="CreateCmsPageEntityTestVariation3" summary="Create page with widget and system variable">
34+
<data name="tag" xsi:type="string">severity:S1</data>
3335
<data name="fixtureType" xsi:type="string">cmsPage</data>
3436
<data name="data/is_active" xsi:type="string">Yes</data>
3537
<data name="data/title" xsi:type="string">NewCmsPage%isolation%</data>
@@ -39,20 +41,17 @@
3941
<data name="data/content/widget/dataset" xsi:type="string">default</data>
4042
<data name="data/content/variable" xsi:type="string">General Contact Name</data>
4143
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageSuccessSaveMessage" />
42-
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageForm" />
43-
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageInGrid" />
4444
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPagePreview" />
4545
</variation>
4646
<variation name="CreateCmsPageEntityTestVariation4" summary="Create disabled page">
47+
<data name="tag" xsi:type="string">severity:S3</data>
4748
<data name="fixtureType" xsi:type="string">cmsPage</data>
4849
<data name="data/title" xsi:type="string">NewCmsPage%isolation%</data>
4950
<data name="data/identifier" xsi:type="string">identifier-%isolation%</data>
5051
<data name="data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
5152
<data name="data/is_active" xsi:type="string">No</data>
5253
<data name="data/content/content" xsi:type="string">cms_page_text_content%isolation%</data>
5354
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageSuccessSaveMessage" />
54-
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageForm" />
55-
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageInGrid" />
5655
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageDisabledOnFrontend" />
5756
</variation>
5857
</testCase>

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageRewriteEntityTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class CreateCmsPageRewriteEntityTest extends Injectable
3333
/* tags */
3434
const MVP = 'yes';
3535
const TEST_TYPE = 'extended_acceptance_test';
36+
const SEVERITY = 'S1';
3637
/* end tags */
3738

3839
/**

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageRewriteEntityTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Cms\Test\TestCase\CreateCmsPageRewriteEntityTest" summary="Create CMS Page URL Rewrites" ticketId="MAGETWO-24847">
1010
<variation name="CreateCmsPageRewriteEntityTestVariation1">
11-
<data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
11+
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S1</data>
1212
<data name="urlRewrite/data/entity_type" xsi:type="string">For CMS page</data>
1313
<data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
1414
<data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%</data>
@@ -19,6 +19,7 @@
1919
<constraint name="Magento\Cms\Test\Constraint\AssertUrlRewriteCmsPageRedirect" />
2020
</variation>
2121
<variation name="CreateCmsPageRewriteEntityTestVariation2">
22+
<data name="tag" xsi:type="string">severity:S1</data>
2223
<data name="urlRewrite/data/entity_type" xsi:type="string">For CMS page</data>
2324
<data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
2425
<data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%.html</data>
@@ -29,6 +30,7 @@
2930
<constraint name="Magento\Cms\Test\Constraint\AssertUrlRewriteCmsPageRedirect" />
3031
</variation>
3132
<variation name="CreateCmsPageRewriteEntityTestVariation3">
33+
<data name="tag" xsi:type="string">severity:S1</data>
3234
<data name="urlRewrite/data/entity_type" xsi:type="string">For CMS page</data>
3335
<data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
3436
<data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%.htm</data>
@@ -39,6 +41,7 @@
3941
<constraint name="Magento\Cms\Test\Constraint\AssertUrlRewriteCmsPageRedirect" />
4042
</variation>
4143
<variation name="CreateCmsPageRewriteEntityTestVariation4">
44+
<data name="tag" xsi:type="string">severity:S1</data>
4245
<data name="urlRewrite/data/entity_type" xsi:type="string">For CMS page</data>
4346
<data name="urlRewrite/data/target_path/entity" xsi:type="string">cms/page/view/page_id/%cmsPage::default%</data>
4447
<data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%.aspx</data>

0 commit comments

Comments
 (0)