Merge remote-tracking branch 'trigger/MAGETWO-90347-Close-icon-displaying-on-product' into MAGETWO-86867-cleanup

irenelagno · irenelagno · commit 6273dd3ef430 · 2018-05-31T11:21:58.000-05:00
diff --git a/app/code/Magento/Catalog/Ui/Component/UrlInput/Category.php b/app/code/Magento/Catalog/Ui/Component/UrlInput/Category.php
@@ -46,6 +46,7 @@ public function getConfig(): array
             'sortOrder' => 30,
             'missingValuePlaceholder' => __('Category with ID: %s doesn\'t exist'),
             'isDisplayMissingValuePlaceholder' => true,
+            'isRemoveSelectedIcon' => true,
         ];
     }
 }
diff --git a/app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php b/app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php
@@ -50,6 +50,7 @@ public function getConfig(): array
             'emptyOptionsHtml' => __('Start typing to find products'),
             'missingValuePlaceholder' => __('Product with ID: %s doesn\'t exist'),
             'isDisplayMissingValuePlaceholder' => true,
+            'isRemoveSelectedIcon' => true,
             'validationUrl' => $this->urlBuilder->getUrl('catalog/product/getSelected'),
         ];
     }
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
@@ -176,7 +176,7 @@ define([
             pageLimit: 50,
             deviation: 30,
             validationLoading: false,
-            isRemoveSelectedIcon: true,
+            isRemoveSelectedIcon: false,
             debounce: 300,
             missingValuePlaceholder: $t('Entity with ID: %s doesn\'t exist'),
             isDisplayMissingValuePlaceholder: false,

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ public function getConfig(): array`
`46`	`46`	`'sortOrder' => 30,`
`47`	`47`	`'missingValuePlaceholder' => __('Category with ID: %s doesn\'t exist'),`
`48`	`48`	`'isDisplayMissingValuePlaceholder' => true,`
	`49`	`+ 'isRemoveSelectedIcon' => true,`
`49`	`50`	`];`
`50`	`51`	`}`
`51`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ public function getConfig(): array`
`50`	`50`	`'emptyOptionsHtml' => __('Start typing to find products'),`
`51`	`51`	`'missingValuePlaceholder' => __('Product with ID: %s doesn\'t exist'),`
`52`	`52`	`'isDisplayMissingValuePlaceholder' => true,`
	`53`	`+ 'isRemoveSelectedIcon' => true,`
`53`	`54`	`'validationUrl' => $this->urlBuilder->getUrl('catalog/product/getSelected'),`
`54`	`55`	`];`
`55`	`56`	`}`