Merge remote-tracking branch 'mainline/develop' into MAGETWO-50202-New-Shipment

Author: Cari Spruiell

app/code/Magento/Backend/Block/Store/Switcher.php

@@ -16,7 +16,7 @@ class Switcher extends \Magento\Backend\Block\Template
     /**
      * URL for store switcher hint
      */
-    const HINT_URL = 'http://docs.magento.com/m2/ce/user_guide/stores/configuration.html';
+    const HINT_URL = 'http://docs.magento.com/m2/ce/user_guide/configuration/scope.html';
 
     /**
      * Name of website variable

app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml

@@ -10,38 +10,41 @@
 
 <form method="post" action="" id="login-form" data-mage-init='{"form": {}, "validation": {}}' autocomplete="off">
     <fieldset class="admin__fieldset">
-        <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Welcome, please sign in') ?></span></legend><br/>
+        <legend class="admin__legend">
+            <span><?php /* @escapeNotVerified */ echo __('Welcome, please sign in') ?></span>
+        </legend><br/>
         <input name="form_key" type="hidden" value="<?php /* @escapeNotVerified */ echo $block->getFormKey() ?>" />
         <div class="admin__field _required field-username">
-            <label for="username" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Username') ?></span></label>
+            <label for="username" class="admin__field-label">
+                <span><?php /* @escapeNotVerified */ echo __('Username') ?></span>
+            </label>
             <div class="admin__field-control">
-                <input
-                    id="username"
-                    class="admin__control-text"
-                    type="text"
-                    name="login[username]"
-                    autofocus
-                    value=""
-                    data-validate="{required:true}"
-                    placeholder="<?php /* @escapeNotVerified */ echo __('user name') ?>"/>
+                <input id="username"
+                       class="admin__control-text"
+                       type="text"
+                       name="login[username]"
+                       autofocus
+                       value=""
+                       data-validate="{required:true}"
+                       placeholder="<?php /* @escapeNotVerified */ echo __('user name') ?>"
+                       autocomplete="username"
+                    />
             </div>
         </div>
         <div class="admin__field _required field-password">
-            <label for="login" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Password') ?></span></label>
+            <label for="login" class="admin__field-label">
+                <span><?php /* @escapeNotVerified */ echo __('Password') ?></span>
+            </label>
             <div class="admin__field-control">
-                <!-- This is a dummy hidden field to trick firefox from auto filling the password -->
-                <input
-                    id="dummy"
-                    class="admin__control-dummy"
-                    type="text"
-                    name="dummy"/>
-                <input
-                    id="login"
-                    class="admin__control-text"
-                    type="password"
-                    name="login[password]"
-                    data-validate="{required:true}"
-                    value="" placeholder="<?php /* @escapeNotVerified */ echo __('password') ?>" />
+                <input id="login"
+                       class="admin__control-text"
+                       type="password"
+                       name="login[password]"
+                       data-validate="{required:true}"
+                       value=""
+                       placeholder="<?php /* @escapeNotVerified */ echo __('password') ?>"
+                       autocomplete="current-password"
+                    />
             </div>
         </div>
         <?php echo $block->getChildHtml('form.additional.info'); ?>

app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php

@@ -19,6 +19,7 @@
 use Magento\Framework\Api\SortOrderBuilder;
 use Magento\Framework\Exception\LocalizedException;
 use Psr\Log\LoggerInterface;
+use Magento\Framework\Api\ExtensionAttributesFactory;
 
 /**
  * Class AddAttributeToTemplate
@@ -72,6 +73,11 @@ class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Produ
      */
     protected $logger;
 
+    /**
+     * @var ExtensionAttributesFactory
+     */
+    protected $extensionAttributesFactory;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param Builder $productBuilder
@@ -84,6 +90,7 @@ class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Produ
      * @param SortOrderBuilder $sortOrderBuilder
      * @param AttributeManagementInterface $attributeManagement
      * @param LoggerInterface $logger
+     * @param ExtensionAttributesFactory $extensionAttributesFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -97,7 +104,8 @@ public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
         SortOrderBuilder $sortOrderBuilder,
         AttributeManagementInterface $attributeManagement,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        ExtensionAttributesFactory $extensionAttributesFactory
     ) {
         parent::__construct($context, $productBuilder);
         $this->resultJsonFactory = $resultJsonFactory;
@@ -109,6 +117,7 @@ public function __construct(
         $this->sortOrderBuilder = $sortOrderBuilder;
         $this->attributeManagement = $attributeManagement;
         $this->logger = $logger;
+        $this->extensionAttributesFactory = $extensionAttributesFactory;
     }
 
     /**
@@ -153,10 +162,14 @@ public function execute()
                 $attributeGroup = $this->attributeGroupFactory->create();
             }
 
-            $attributeGroup->setAttributeGroupCode($groupCode);
-            $attributeGroup->setSortOrder($groupSortOrder);
+            $extensionAttributes = $attributeGroup->getExtensionAttributes()
+                ?: $this->extensionAttributesFactory->create(AttributeGroupInterface::class);
+
+            $extensionAttributes->setAttributeGroupCode($groupCode);
+            $extensionAttributes->setSortOrder($groupSortOrder);
             $attributeGroup->setAttributeGroupName($groupName);
             $attributeGroup->setAttributeSetId($attributeSet->getAttributeSetId());
+            $attributeGroup->setExtensionAttributes($extensionAttributes);
 
             $this->attributeGroupRepository->save($attributeGroup);
 

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php

@@ -151,7 +151,7 @@ protected function getFieldsForFieldset()
         $websitesList = $this->getWebsitesList();
         $isNewProduct = !$this->locator->getProduct()->getId();
         $tooltip = [
-            'link' => 'http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes',
+            'link' => 'http://docs.magento.com/m2/ce/user_guide/configuration/scope.html',
             'description' => __(
                 'If your Magento site has multiple views, ' .
                 'you can set the scope to apply to a specific view.'

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

@@ -45,6 +45,7 @@
                             <item name="dataType" xsi:type="string">text</item>
                             <item name="formElement" xsi:type="string">input</item>
                             <item name="dataScope" xsi:type="string">watermark_image_imageOpacity</item>
+                            <item name="addafter" xsi:type="string">%</item>
                             <item name="validation" xsi:type="array">
                                 <item name="validate-number" xsi:type="boolean">true</item>
                             </item>
@@ -61,9 +62,7 @@
                             <item name="validation" xsi:type="array">
                                 <item name="validate-digits" xsi:type="boolean">true</item>
                             </item>
-                            <item name="tooltip" xsi:type="array">
-                                <item name="description" xsi:type="string" translate="true">Example format: 200x300.</item>
-                            </item>
+                            <item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
                         </item>
                     </argument>
                 </field>
@@ -109,6 +108,7 @@
                             <item name="dataType" xsi:type="string">text</item>
                             <item name="formElement" xsi:type="string">input</item>
                             <item name="dataScope" xsi:type="string">watermark_thumbnail_imageOpacity</item>
+                            <item name="addafter" xsi:type="string">%</item>
                             <item name="validation" xsi:type="array">
                                 <item name="validate-number" xsi:type="boolean">true</item>
                             </item>
@@ -125,9 +125,7 @@
                             <item name="validation" xsi:type="array">
                                 <item name="validate-digits" xsi:type="boolean">true</item>
                             </item>
-                            <item name="tooltip" xsi:type="array">
-                                <item name="description" xsi:type="string" translate="true">Example format: 200x300.</item>
-                            </item>
+                            <item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
                         </item>
                     </argument>
                 </field>
@@ -173,6 +171,7 @@
                             <item name="dataType" xsi:type="string">text</item>
                             <item name="formElement" xsi:type="string">input</item>
                             <item name="dataScope" xsi:type="string">watermark_small_image_imageOpacity</item>
+                            <item name="addafter" xsi:type="string">%</item>
                             <item name="validation" xsi:type="array">
                                 <item name="validate-number" xsi:type="boolean">true</item>
                             </item>
@@ -189,9 +188,7 @@
                             <item name="validation" xsi:type="array">
                                 <item name="validate-digits" xsi:type="boolean">true</item>
                             </item>
-                            <item name="tooltip" xsi:type="array">
-                                <item name="description" xsi:type="string" translate="true">Example format: 200x300.</item>
-                            </item>
+                            <item name="notice" xsi:type="string" translate="true">Example format: 200x300.</item>
                         </item>
                     </argument>
                 </field>

app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml

@@ -130,7 +130,7 @@
                     <item name="source" xsi:type="string">catalog_rule</item>
                     <item name="dataScope" xsi:type="string">website_ids</item>
                     <item name="tooltip" xsi:type="array">
-                        <item name="link" xsi:type="string">http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes</item>
+                        <item name="link" xsi:type="string">http://docs.magento.com/m2/ce/user_guide/configuration/scope.html</item>
                         <item name="description" xsi:type="string">What is this?</item>
                     </item>
                 </item>

app/code/Magento/Checkout/view/frontend/page_layout/checkout.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->

app/code/Magento/Customer/view/base/ui_component/customer_form.xml

@@ -103,7 +103,7 @@
                         <item name="required-entry" xsi:type="boolean">true</item>
                     </item>
                     <item name="tooltip" xsi:type="array">
-                        <item name="link" xsi:type="string">http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes</item>
+                        <item name="link" xsi:type="string">http://docs.magento.com/m2/ce/user_guide/configuration/scope.html</item>
                         <item name="description" xsi:type="string" translate="true">If your Magento site has multiple views, you can set the scope to apply to a specific view.</item>
                     </item>
                 </item>

app/code/Magento/Eav/Api/Data/AttributeGroupInterface.php

@@ -10,12 +10,10 @@
 interface AttributeGroupInterface extends ExtensibleDataInterface
 {
     const GROUP_ID = 'attribute_group_id';
+
     const GROUP_NAME = 'attribute_group_name';
+
     const ATTRIBUTE_SET_ID = 'attribute_set_id';
-    const SORT_ORDER = 'sort_order';
-    const DEFAULT_ID = 'default_id';
-    const ATTRIBUTE_GROUP_CODE = 'attribute_group_code';
-    const SCOPE_CODE = 'tab_group_code';
 
     /**
      * Retrieve id
@@ -62,66 +60,6 @@ public function getAttributeSetId();
      */
     public function setAttributeSetId($attributeSetId);
 
-    /**
-     * Retrieve sort order
-     *
-     * @return int
-     */
-    public function getSortOrder();
-
-    /**
-     * Set sort order
-     *
-     * @param int $sortOrder
-     * @return $this
-     */
-    public function setSortOrder($sortOrder);
-
-    /**
-     * Retrieve default ID
-     *
-     * @return int
-     */
-    public function getDefaultId();
-
-    /**
-     * Set default ID
-     *
-     * @param int $defaultId
-     * @return $this
-     */
-    public function setDefaultId($defaultId);
-
-    /**
-     * Retrieve attribute group code
-     *
-     * @return string
-     */
-    public function getAttributeGroupCode();
-
-    /**
-     * Set attribute group code
-     *
-     * @param string $attributeGroupCode
-     * @return $this
-     */
-    public function setAttributeGroupCode($attributeGroupCode);
-
-    /**
-     * Retrieve scope code
-     *
-     * @return string
-     */
-    public function getScopeCode();
-
-    /**
-     * Set scope code
-     *
-     * @param string $scopeCode
-     * @return $this
-     */
-    public function setScopeCode($scopeCode);
-
     /**
      * Retrieve existing extension attributes object.
      *

app/code/Magento/Eav/Model/Attribute/GroupRepository.php

@@ -199,12 +199,12 @@ protected function retrieveAttributeSetIdFromSearchCriteria(
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return null|string
      */
-    protected function retrieveAttributeGroupCodeFromSearchCriteria(
+    private function retrieveAttributeGroupCodeFromSearchCriteria(
         \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
     ) {
         foreach ($searchCriteria->getFilterGroups() as $group) {
             foreach ($group->getFilters() as $filter) {
-                if ($filter->getField() == 'attribute_group_code') {
+                if ($filter->getField() === 'attribute_group_code') {
                     return $filter->getValue();
                 }
             }