Skip to content

Commit 3b69454

Browse files
sevos1984sevos1984
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents d659975 + 268808d commit 3b69454

File tree

200 files changed

+2671
-1842
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+2671
-1842
lines changed

‎app/code/Magento/Authorization/sql/authorization_setup/install-2.0.0.php

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,7 @@
99

1010
$installer->startSetup();
1111

12-
if ($installer->getConnection()->isTableExists($installer->getTable('admin_role'))) {
13-
/**
14-
* Rename existing 'admin_role' table into 'authorization_role' (to avoid forcing Magento re-installation)
15-
* TODO: This conditional logic can be removed some time after pull request is delivered to the mainline
16-
*/
17-
$installer->getConnection()->renameTable(
18-
$installer->getTable('admin_role'),
19-
$installer->getTable('authorization_role')
20-
);
21-
} elseif (!$installer->getConnection()->isTableExists($installer->getTable('authorization_role'))) {
12+
if (!$installer->getConnection()->isTableExists($installer->getTable('authorization_role'))) {
2213
/**
2314
* Create table 'authorization_role'
2415
*/
@@ -84,16 +75,7 @@
8475
$installer->getConnection()->createTable($table);
8576
}
8677

87-
if ($installer->getConnection()->isTableExists($installer->getTable('admin_rule'))) {
88-
/**
89-
* Rename existing 'admin_rule' table into 'authorization_rule' (to avoid forcing Magento re-installation)
90-
* TODO: This conditional logic can be removed some time after pull request is delivered to the mainline
91-
*/
92-
$installer->getConnection()->renameTable(
93-
$installer->getTable('admin_rule'),
94-
$installer->getTable('authorization_rule')
95-
);
96-
} elseif (!$installer->getConnection()->isTableExists($installer->getTable('authorization_rule'))) {
78+
if (!$installer->getConnection()->isTableExists($installer->getTable('authorization_rule'))) {
9779
/**
9880
* Create table 'authorization_rule'
9981
*/

‎app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,9 @@ public function execute()
5454

5555
if ($this->_objectManager->get('Magento\Framework\Locale\Validator')->isValid($interfaceLocale)) {
5656
$user->setInterfaceLocale($interfaceLocale);
57-
$this->_objectManager->get(
58-
'Magento\Backend\Model\Locale\Manager'
59-
)->switchBackendInterfaceLocale(
60-
$interfaceLocale
61-
);
57+
/** @var \Magento\Backend\Model\Locale\Manager $localeManager */
58+
$localeManager = $this->_objectManager->get('Magento\Backend\Model\Locale\Manager');
59+
$localeManager->switchBackendInterfaceLocale($interfaceLocale);
6260
}
6361
/** Before updating admin user data, ensure that password of current admin user is entered and is correct */
6462
$currentUserPasswordField = \Magento\User\Block\User\Edit\Tab\Main::CURRENT_USER_PASSWORD_FIELD;
@@ -75,7 +73,10 @@ public function execute()
7573
$user->setPasswordConfirmation($passwordConfirmation);
7674
}
7775
$user->save();
78-
$user->sendPasswordResetNotificationEmail();
76+
/** Send password reset email notification only when password was changed */
77+
if ($password !== '') {
78+
$user->sendPasswordResetNotificationEmail();
79+
}
7980
$this->messageManager->addSuccess(__('The account has been saved.'));
8081
} catch (\Magento\Framework\Model\Exception $e) {
8182
$this->messageManager->addMessages($e->getMessages());

‎app/code/Magento/Backend/Controller/Adminhtml/System/Config/Save.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,10 @@ public function execute()
186186
$resultRedirect = $this->resultRedirectFactory->create();
187187
return $resultRedirect->setPath(
188188
'adminhtml/system_config/edit',
189-
['_current' => ['section', 'website', 'store']]
189+
[
190+
'_current' => ['section', 'website', 'store'],
191+
'_nosid' => true
192+
]
190193
);
191194
}
192195
}

‎app/code/Magento/Backend/view/adminhtml/requirejs-config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
var config = {
77
map: {
88
'*': {
9+
editTrigger: 'mage/edit-trigger',
910
translateInline: 'mage/translate-inline',
1011
form: 'mage/backend/form',
1112
button: 'mage/backend/button',
@@ -37,4 +38,4 @@ var config = {
3738
paths: {
3839
"jquery/ui": "jquery/jquery-ui-1.9.2"
3940
}
40-
};
41+
};

‎app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66
namespace Magento\Catalog\Model\Product\Media;
77

8-
use \Magento\Catalog\Api\ProductMediaAttributeManagementInterface;
9-
use \Magento\Store\Model\StoreManagerInterface;
10-
use \Magento\Catalog\Model\Product;
8+
use Magento\Catalog\Api\ProductMediaAttributeManagementInterface;
9+
use Magento\Store\Model\StoreManagerInterface;
10+
use Magento\Catalog\Model\Product;
1111

1212
class AttributeManagement implements ProductMediaAttributeManagementInterface
1313
{

‎app/code/Magento/Catalog/etc/webapi.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<resource ref="Magento_Catalog::products" />
2828
</resources>
2929
</route>
30-
<route url="/V1/products" method="PUT">
30+
<route url="/V1/products" method="GET">
3131
<service class="Magento\Catalog\Api\ProductRepositoryInterface" method="getList"/>
3232
<resources>
3333
<resource ref="Magento_Catalog::products" />
@@ -52,7 +52,7 @@
5252
<resource ref="Magento_Catalog::attributes_attributes" />
5353
</resources>
5454
</route>
55-
<route url="/V1/products/attributes" method="PUT">
55+
<route url="/V1/products/attributes" method="GET">
5656
<service class="Magento\Catalog\Api\ProductAttributeRepositoryInterface" method="getList" />
5757
<resources>
5858
<resource ref="Magento_Catalog::attributes_attributes" />
@@ -64,7 +64,7 @@
6464
<resource ref="Magento_Catalog::attributes_attributes" />
6565
</resources>
6666
</route>
67-
<route url="/V1/categories/attributes" method="PUT">
67+
<route url="/V1/categories/attributes" method="GET">
6868
<service class="Magento\Catalog\Api\CategoryAttributeRepositoryInterface" method="getList" />
6969
<resources>
7070
<resource ref="Magento_Catalog::attributes_attributes" />
@@ -100,7 +100,7 @@
100100
<resource ref="Magento_Catalog::products"/>
101101
</resources>
102102
</route>
103-
<route url="/V1/products/attribute-sets/sets/list" method="PUT">
103+
<route url="/V1/products/attribute-sets/sets/list" method="GET">
104104
<service class="Magento\Catalog\Api\AttributeSetRepositoryInterface" method="getList"/>
105105
<resources>
106106
<resource ref="Magento_Catalog::sets"/>
@@ -148,7 +148,7 @@
148148
<resource ref="Magento_Catalog::sets"/>
149149
</resources>
150150
</route>
151-
<route url="/V1/products/attribute-sets/groups/list" method="PUT">
151+
<route url="/V1/products/attribute-sets/groups/list" method="GET">
152152
<service class="Magento\Catalog\Api\ProductAttributeGroupRepositoryInterface" method="getList"/>
153153
<resources>
154154
<resource ref="Magento_Catalog::sets"/>

‎app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* @var $this \Magento\Catalog\Block\Product\ProductList\Toolbar
1212
*/
13-
use \Magento\Catalog\Model\Product\ProductList\Toolbar;
13+
use Magento\Catalog\Model\Product\ProductList\Toolbar;
1414
?>
1515
<?php if ($this->getCollection()->getSize()): ?>
1616
<div class="toolbar toolbar-products" data-mage-init='<?php echo $this->getWidgetOptionsJson(); ?>'>

‎app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* @var $this \Magento\Catalog\Block\Product\ProductList\Toolbar
1212
*/
13-
use \Magento\Catalog\Model\Product\ProductList\Toolbar;
13+
use Magento\Catalog\Model\Product\ProductList\Toolbar;
1414
?>
1515
<p class="toolbar-amount">
1616
<?php if ($this->getLastPageNum() > 1): ?>

‎app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* @var $this \Magento\Catalog\Block\Product\ProductList\Toolbar
1212
*/
13-
use \Magento\Catalog\Model\Product\ProductList\Toolbar;
13+
use Magento\Catalog\Model\Product\ProductList\Toolbar;
1414
?>
1515
<div class="field limiter">
1616
<label class="label" for="limiter">

‎app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* @var $this \Magento\Catalog\Block\Product\ProductList\Toolbar
1212
*/
13-
use \Magento\Catalog\Model\Product\ProductList\Toolbar;
13+
use Magento\Catalog\Model\Product\ProductList\Toolbar;
1414
?>
1515
<div class="toolbar-sorter sorter">
1616
<label class="sorter-label" for="sorter"><?php echo __('Sort By') ?></label>

0 commit comments

Comments
 (0)