Merge pull request #642 from magento-tsg/2.0-develop-pr2

[TSG] Backporting for 2.0

Author: Volodymyr Klymenko

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml

@@ -49,7 +49,7 @@
                                    data-store-label="<%- data.title %>"
                                    <% if (typeof data.scopeTitleDisabled != 'undefined' && data.scopeTitleDisabled != null) { %> disabled="disabled" <% } %>
                                    >
-                            <%- data.checkboxScopeTitle %>
+                            <%= data.checkboxScopeTitle %>
                         </div>
                     </div>
 

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml

@@ -44,7 +44,7 @@
         <td class="col-name select-opt-title">
             <input name="product[options][<%- data.id %>][values][<%- data.select_id %>][option_type_id]" type="hidden" value="<%- data.option_type_id %>">
             <input id="product_option_<%- data.id %>_select_<%- data.select_id %>_is_delete" name="product[options][<%- data.id %>][values][<%- data.select_id %>][is_delete]" type="hidden" value="">
-            <input id="product_option_<%- data.id %>_select_<%- data.select_id %>_title" <% if (typeof data.scopeTitleDisabled != 'undefined' && data.scopeTitleDisabled != null) { %> disabled="disabled" <% } %> name="product[options][<%- data.id %>][values][<%- data.select_id %>][title]" class="required-entry input-text select-type-title <% if (typeof data.scopeTitleDisabled != 'undefined' && data.scopeTitleDisabled != null) { %> disabled <% } %>" type="text" value="<%- data.title %>" data-store-label="<%- data.title %>"><%- data.checkboxScopeTitle %>
+            <input id="product_option_<%- data.id %>_select_<%- data.select_id %>_title" <% if (typeof data.scopeTitleDisabled != 'undefined' && data.scopeTitleDisabled != null) { %> disabled="disabled" <% } %> name="product[options][<%- data.id %>][values][<%- data.select_id %>][title]" class="required-entry input-text select-type-title <% if (typeof data.scopeTitleDisabled != 'undefined' && data.scopeTitleDisabled != null) { %> disabled <% } %>" type="text" value="<%- data.title %>" data-store-label="<%- data.title %>"><%= data.checkboxScopeTitle %>
         </td>
         <?php if ($block->getCanReadPrice() !== false) : ?>
         <td class="col-price select-opt-price">

app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Event\Observer;
 use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Store\Model\Store;
 
 class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
@@ -42,13 +43,22 @@ public function __construct(
     /**
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
+     * @throws LocalizedException
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
         /** @var Category $category */
         $category = $observer->getEvent()->getCategory();
         if ($category->getUrlKey() !== false) {
-            $category->setUrlKey($this->categoryUrlPathGenerator->getUrlKey($category))
+
+            /** @var string $resultUrlKey */
+            $resultUrlKey = $this->categoryUrlPathGenerator->getUrlKey($category);
+
+            if (empty($resultUrlKey)) {
+                throw new LocalizedException(__('Invalid URL key'));
+            }
+
+            $category->setUrlKey($resultUrlKey)
                 ->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
             if (!$category->isObjectNew()) {
                 $category->getResource()->saveAttribute($category, 'url_path');