Merge remote-tracking branch 'upstream/develop' into create-default-hydrator

Author: Igor Melnikov

app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml

@@ -50,6 +50,7 @@ require([
             showTime: false,
             showHour: false,
             showMinute: false,
+            serverTimezoneSeconds: <?php echo (int) $block->getStoreTimestamp(); ?>,
             yearRange: '<?php /* @escapeNotVerified */ echo $block->getYearRange() ?>'
         }
     });

app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml

@@ -74,7 +74,7 @@
                 </field>
                 <field name="theme">
                     <argument name="data" xsi:type="array">
-                        <item name="options" xsi:type="object">Magento\Framework\View\Design\Theme\Label</item>
+                        <item name="options" xsi:type="object">Magento\Theme\Model\Design\Theme\Label</item>
                         <item name="config" xsi:type="array">
                             <item name="formElement" xsi:type="string">select</item>
                             <item name="dataType" xsi:type="string">text</item>

app/code/Magento/Catalog/view/adminhtml/web/js/bundle-proxy-button.js

@@ -54,6 +54,19 @@ define([
             return this;
         },
 
+        /**
+         * Calls 'destroy' of parent and
+         * clear listing provider source
+         *
+         * @returns {Object} Chainable.
+         */
+        destroy: function () {
+            this._super();
+            this.source.set(this.listingDataProvider, []);
+
+            return this;
+        },
+
         /**
          * Call parent "action" method
          * and set new data to record and listing.

app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php

@@ -55,6 +55,7 @@ protected function _afterLoad()
          * Assign parent items
          */
         foreach ($this as $item) {
+            $this->_resource->unserializeFields($item);
             if ($item->getParentItemId()) {
                 $item->setParentItem($this->getItemById($item->getParentItemId()));
             }

app/code/Magento/Theme/Model/Design/Theme/Label.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Theme\Model\Design\Theme;
+
+class Label extends \Magento\Framework\View\Design\Theme\Label
+{
+    /**
+     * Return labels collection array
+     *
+     * @param bool|string $label add empty values to result with specific label
+     * @return array
+     */
+    public function getLabelsCollection($label = false)
+    {
+        $options = parent::getLabelsCollection();
+        if ($label) {
+            array_unshift($options, ['value' => 0, 'label' => $label]);
+        }
+        return $options;
+    }
+}

app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js

@@ -556,15 +556,6 @@ define([
                     this.setMaxPosition();
                 }
 
-                elems.forEach(function (record) {
-                    _.where(record.elems(),
-                        {
-                            formElement: 'select'
-                        }).forEach(function (elem) {
-                        elem.value(undefined);
-                    });
-                });
-
                 path = this.dataScope + '.' + this.index + '.' + (this.startIndex + idx);
                 this.source.set(path, rec);
             }, this);

lib/internal/Magento/Framework/Session/SessionManager.php

@@ -470,7 +470,7 @@ public function regenerateId()
             return $this;
         }
         if ($this->isSessionExists()) {
-            session_regenerate_id(true);
+            session_regenerate_id(false);
         } else {
             session_start();
         }

lib/web/mage/calendar.js

@@ -75,12 +75,15 @@
             var self = this;
 
             /**
-             * overwrite jQuery UI datepicker function.
+             * Overwrite jQuery UI datepicker function.
+             * Reason: magento date could be set before calendar show
+             * but local date will be styled as current in original _generateHTML
+             *
              * @param {Object} inst - instance datepicker.
              * @return {String} html template
              */
             $.datepicker.constructor.prototype._generateHTML = function (inst) {
-                var today = this._daylightSavingAdjust(self.getTimezoneDate()),
+                var today = self.getTimezoneDate(),
                     isRTL = this._get(inst, 'isRTL'),
                     showButtonPanel = this._get(inst, 'showButtonPanel'),
                     hideIfNoPrevNext = this._get(inst, 'hideIfNoPrevNext'),
@@ -315,17 +318,20 @@
 
         /**
          * If server timezone is defined then take to account server timezone shift
-         * @param {Object} date
          * @return {Object} date
          */
-        getTimezoneDate: function (date) {
-            date = date || new Date();
+        getTimezoneDate: function () {
 
-            if (this.options.serverTimezoneSeconds) {
-                date.setTime((this.options.serverTimezoneSeconds + date.getTimezoneOffset() * 60) * 1000);
+            // Get local time in ms
+            var ms = Date.now();
+
+            // Use store timestamp based on store timezone settings
+            if (typeof this.options.serverTimezoneSeconds !== 'undefined') {
+                //Adjust milliseconds according to client local timezone offset
+                ms = (this.options.serverTimezoneSeconds + new Date().getTimezoneOffset() * 60) * 1000;
             }
 
-            return date;
+            return new Date(ms);
         },
 
         /**
@@ -396,10 +402,7 @@
                         'yy': 'yy' // Always long year format on frontend
                     },
                     time: {
-                        'a': 'TT',
-                        'H': 'h',
-                        'MM': 'mm',
-                        'SS': 'ss'
+                        'a': 'TT'
                     }
                 },
 
@@ -518,9 +521,12 @@
      * @param {Object} el
      */
     $.datepicker._gotoToday = function (el) {
-        $.datepicker._gotoTodayOriginal.call(this, el);
-        $.datepicker._selectDate.call(this, el);
-        $(el).blur();   // To ensure that user can re-select date field without clicking outside it first.
+        var pickerObject = $(el);
+
+        // Set date/time according to timezone offset        
+        pickerObject.datepicker( "setDate", pickerObject.calendar("getTimezoneDate") )
+            // To ensure that user can re-select date field without clicking outside it first.
+            .blur();
     };
 
     return {