Merge pull request #416 from magento-ogre/PR_Branch

[Ogre] Bug fixes, Public PRs

Author: mazhalai

.gitignore

@@ -46,5 +46,5 @@ atlassian*
 
 /var/*
 !/var/.htaccess
-/vendor
+/vendor/*
 !/vendor/.htaccess

app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml

@@ -28,16 +28,16 @@
     <script data-template="search-suggest" type="text/x-magento-template">
         <ul class="search-global-menu">
         <li class="item">
-            <a href="<?php /* @escapeNotVerified */ echo $block->getURL('catalog/product/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
+            <a id="searchPreviewProducts" href="<?php /* @escapeNotVerified */ echo $block->getURL('catalog/product/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
         </li>
         <li class="item">
-            <a href="<?php /* @escapeNotVerified */ echo $block->getURL('sales/order/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
+            <a id="searchPreviewOrders" href="<?php /* @escapeNotVerified */ echo $block->getURL('sales/order/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
         </li>
         <li class="item">
-            <a href="<?php /* @escapeNotVerified */ echo $block->getURL('customer/index/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
+            <a id="searchPreviewCustomers" href="<?php /* @escapeNotVerified */ echo $block->getURL('customer/index/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
         </li>
         <li class="item">
-            <a href="<?php /* @escapeNotVerified */ echo $block->getURL('cms/page/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
+            <a id="searchPreviewPages" href="<?php /* @escapeNotVerified */ echo $block->getURL('cms/page/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
         </li>
             <% if (data.items.length) { %>
             <% _.each(data.items, function(value){ %>

app/code/Magento/Backup/Helper/Data.php

@@ -122,7 +122,7 @@ public function getExtensions()
             \Magento\Framework\Backup\Factory::TYPE_SYSTEM_SNAPSHOT => 'tgz',
             \Magento\Framework\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'tgz',
             \Magento\Framework\Backup\Factory::TYPE_MEDIA => 'tgz',
-            \Magento\Framework\Backup\Factory::TYPE_DB => 'gz'
+            \Magento\Framework\Backup\Factory::TYPE_DB => 'sql'
         ];
     }
 

app/code/Magento/MediaStorage/Model/File/Storage/Database.php

@@ -41,6 +41,13 @@ class Database extends \Magento\MediaStorage\Model\File\Storage\Database\Abstrac
      */
     protected $_mediaHelper;
 
+    /**
+     * Store media base directory path
+     *
+     * @var string
+     */
+    protected $mediaBaseDirectory = null;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -352,4 +359,17 @@ public function deleteFile($path)
 
         return $this;
     }
+
+    /**
+     * Retrieve media base directory path
+     *
+     * @return string
+     */
+    public function getMediaBaseDirectory()
+    {
+        if ($this->mediaBaseDirectory === null) {
+            $this->mediaBaseDirectory = $this->_coreFileStorageDb->getMediaBaseDir();
+        }
+        return $this->mediaBaseDirectory;
+    }
 }

app/code/Magento/Search/view/adminhtml/ui_component/search_synonyms_form.xml

@@ -102,14 +102,17 @@
                 <item name="config" xsi:type="array">
                     <item name="additionalClasses" xsi:type="string">admin__field-no-label</item>
                     <item name="description" xsi:type="string" translate="true">Merge existing synonyms</item>
-                    <item name="dataType" xsi:type="string">boolean</item>
                     <item name="default" xsi:type="boolean">false</item>
                     <item name="formElement" xsi:type="string">checkbox</item>
                     <item name="dataScope" xsi:type="string">mergeOnConflict</item>
                     <item name="source" xsi:type="string">block</item>
                     <item name="tooltip" xsi:type="array">
                         <item name="description" xsi:type="string" translate="true">Automatically merges synonyms in groups that share the same scope. If you check this box and you add one or more of the same terms to different synonym groups in the same scope, automatically merges all the terms to one group. If this isn't what you want, uncheck the box and an error displays if you try to add the same terms.</item>
                     </item>
+                    <item name="valueMap" xsi:type="array">
+                        <item name="true" xsi:type="boolean">true</item>
+                        <item name="false" xsi:type="boolean">false</item>
+                    </item>
                 </item>
             </argument>
         </field>

app/code/Magento/Theme/Model/Theme/Registration.php

@@ -68,6 +68,7 @@ public function __construct(
     public function register()
     {
         $this->_themeCollection->clear();
+
         foreach ($this->_themeCollection as $theme) {
             $this->_registerThemeRecursively($theme);
         }

app/code/Magento/Theme/Observer/ThemeRegistrationObserver.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Theme\Setup;
+
+use Magento\Framework\Setup\InstallDataInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Theme\Model\Theme\Registration;
+
+/**
+ * Upgrade registered themes
+ */
+class RecurringData implements InstallDataInterface
+{
+    /**
+     * Theme registration
+     *
+     * @var Registration
+     */
+    private $themeRegistration;
+
+    /**
+     * Init
+     *
+     * @param Registration $themeRegistration
+     */
+    public function __construct(Registration $themeRegistration)
+    {
+        $this->themeRegistration = $themeRegistration;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        $this->themeRegistration->register();
+    }
+}