Skip to content

Commit fb70521

Browse files
author
Dale Sikkema
committed
Merge remote-tracking branch 'mainline/develop' into develop
Conflicts: app/code/Magento/Backend/App/Router.php app/code/Magento/Backend/Helper/Dashboard/Data.php app/code/Magento/Backend/Helper/Dashboard/Order.php app/code/Magento/Captcha/Helper/Data.php app/code/Magento/Catalog/Controller/Product/Compare.php app/code/Magento/Catalog/Controller/Product/Compare/Index.php app/code/Magento/Catalog/Helper/Category.php app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php app/code/Magento/CatalogInventory/Helper/Stock.php app/code/Magento/CatalogInventory/Model/Configuration.php app/code/Magento/CatalogInventory/Model/Resource/Stock.php app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php app/code/Magento/CatalogSearch/Controller/Result/Index.php app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php app/code/Magento/Checkout/Controller/Cart.php app/code/Magento/Checkout/Controller/Cart/Add.php app/code/Magento/Checkout/Controller/Cart/Configure.php app/code/Magento/Checkout/Controller/Cart/CouponPost.php app/code/Magento/Checkout/Controller/Cart/EstimatePost.php app/code/Magento/Checkout/Controller/Cart/Index.php app/code/Magento/Checkout/Helper/Cart.php app/code/Magento/Checkout/Helper/Data.php app/code/Magento/Cms/Model/Resource/AbstractCollection.php app/code/Magento/Cms/Model/Resource/Page/Collection.php app/code/Magento/Cookie/Helper/Cookie.php app/code/Magento/Core/Helper/Data.php app/code/Magento/Core/etc/di.xml app/code/Magento/CurrencySymbol/Helper/Data.php app/code/Magento/Customer/Controller/Account/Confirmation.php app/code/Magento/Customer/Controller/Account/LoginPost.php app/code/Magento/Customer/Helper/Address.php app/code/Magento/Customer/Model/Config/Backend/Address/Street.php app/code/Magento/Customer/Model/CustomerRegistry.php app/code/Magento/Customer/Model/GroupManagement.php app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php app/code/Magento/Developer/composer.json app/code/Magento/Directory/Controller/Currency/SwitchAction.php app/code/Magento/Directory/Helper/Data.php app/code/Magento/Directory/Model/PriceCurrency.php app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php app/code/Magento/Downloadable/Helper/Download.php app/code/Magento/Eav/Helper/Data.php app/code/Magento/GiftMessage/Helper/Message.php app/code/Magento/GoogleAnalytics/Helper/Data.php app/code/Magento/GoogleOptimizer/Helper/Data.php app/code/Magento/ImportExport/Helper/Data.php app/code/Magento/Msrp/Helper/Data.php app/code/Magento/Msrp/Model/Config.php app/code/Magento/Newsletter/Controller/Manage/Save.php app/code/Magento/Newsletter/Controller/Subscriber.php app/code/Magento/Persistent/Helper/Data.php app/code/Magento/Persistent/Helper/Session.php app/code/Magento/Quote/Model/Quote/Item/Processor.php app/code/Magento/Quote/Model/QuoteRepository.php app/code/Magento/Review/Controller/Adminhtml/Product/Post.php app/code/Magento/Review/Controller/Product.php app/code/Magento/Review/Helper/Data.php app/code/Magento/Sales/Helper/Guest.php app/code/Magento/Sales/Helper/Reorder.php app/code/Magento/SalesRule/Helper/Coupon.php app/code/Magento/Search/Helper/Data.php app/code/Magento/Search/Model/Query.php app/code/Magento/Sendfriend/Helper/Data.php app/code/Magento/Shipping/Helper/Data.php app/code/Magento/Store/Block/Store/Switcher.php app/code/Magento/Store/Block/Switcher.php app/code/Magento/Store/Model/Store.php app/code/Magento/Store/Model/StoreManager.php app/code/Magento/Store/etc/di.xml app/code/Magento/Tax/Helper/Data.php app/etc/di.xml composer.lock dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php dev/tests/unit/testsuite/Magento/Quote/Model/Quote/Item/ProcessorTest.php dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php lib/internal/Magento/Framework/App/Router/Base.php lib/internal/Magento/Framework/Url/RouteParamsResolver.php lib/internal/Magento/Framework/Url/ScopeResolver.php lib/internal/Magento/Framework/View/Model/Layout/Merge.php
2 parents ad734d7 + baadf05 commit fb70521

File tree

1,027 files changed

+7727
-9256
lines changed

Some content is hidden

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

1,027 files changed

+7727
-9256
lines changed

‎app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function getIdentity()
6969
public function isDisplayed()
7070
{
7171
return $this->_authorization->isAllowed(
72-
'Magento_Adminhtml::cache'
72+
'Magento_Backend::cache'
7373
) && count(
7474
$this->_getCacheTypesForRefresh()
7575
) > 0;

‎app/code/Magento/AdminNotification/etc/acl.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
99
<acl>
1010
<resources>
11-
<resource id="Magento_Adminhtml::admin">
12-
<resource id="Magento_Adminhtml::system">
13-
<resource id="Magento_Adminhtml::system_other_settings">
11+
<resource id="Magento_Backend::admin">
12+
<resource id="Magento_Backend::system">
13+
<resource id="Magento_Backend::system_other_settings">
1414
<resource id="Magento_AdminNotification::adminnotification" title="Notifications" sortOrder="10">
1515
<resource id="Magento_AdminNotification::show_toolbar" title="Show Toolbar" sortOrder="10" />
1616
<resource id="Magento_AdminNotification::show_list" title="Show List" sortOrder="20" />

‎app/code/Magento/AdminNotification/etc/adminhtml/routes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
99
<router id="admin">
1010
<route id="adminhtml">
11-
<module name="Magento_AdminNotification" before="Magento_Adminhtml" />
11+
<module name="Magento_AdminNotification" before="Magento_Backend" />
1212
</route>
1313
</router>
1414
</config>

‎app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
99
<head>
10-
<css src="Magento_Core::prototype/magento.css"/>
10+
<css src="Magento_Theme::prototype/magento.css"/>
1111
</head>
1212
<body>
1313
<referenceContainer name="notifications">

‎app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<strong class="notifications-entry-title"><?php echo $block->escapeHtml($notification->getTitle()); ?></strong>
2525
<span class="notifications-entry-description"><?php echo $block->escapeHtml($notification->getDescription()); ?></span>
2626
<time class="notifications-entry-time"><?php echo $block->escapeHtml($block->formatNotificationDate($notification->getDateAdded())); ?></time>
27-
<button class="action close notifications-close"><span><?php echo __('Close'); ?></span></button>
27+
<button type="button" class="action close notifications-close"><span><?php echo __('Close'); ?></span></button>
2828
<div class="notifications-dialog-content" data-title="<?php echo __('Notification'); ?>" data-cancel-caption="<?php echo __('Cancel'); ?>" data-acknowledge-caption="<?php echo __('Acknowledge'); ?>">
2929
<strong class="notifications-entry-title"><?php echo $block->escapeHtml($notification->getTitle()); ?></strong>
3030
<span class="notifications-entry-description"><?php echo $block->escapeHtml($notification->getDescription()); ?></span>

‎app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,60 @@
22
* Copyright © 2015 Magento. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5-
/*jshint jquery:true*/
65
define([
7-
"jquery",
8-
"jquery/ui",
9-
"jquery/template"
10-
], function($){
11-
12-
$.template(
13-
'systemMessageDialog',
14-
'<li class="{{if severity == 1}}error{{else}}warning{{/if}}">{{html text}}</li>'
15-
);
6+
'jquery',
7+
'mage/template',
8+
'jquery/ui'
9+
], function ($, mageTemplate) {
10+
'use strict';
1611

1712
$.widget('mage.systemMessageDialog', $.ui.dialog, {
1813
options: {
19-
systemMessageTemplate: 'systemMessageDialog'
14+
systemMessageTemplate:
15+
'<% _.each(data.items, function(item) { %>' +
16+
'<li class="<% if (item.severity == 1) { %>error<% } else { %>warning<% } %>">' +
17+
'<%= item.text %>' +
18+
'</li>' +
19+
'<% }); %>'
2020
},
21-
open: function(severity) {
21+
22+
open: function (severity) {
2223
var superMethod = $.proxy(this._super, this);
24+
2325
$.ajax({
2426
url: this.options.ajaxUrl,
2527
type: 'GET',
26-
data: {severity: severity}
27-
}).done($.proxy(function(data) {
28+
data: {
29+
severity: severity
30+
}
31+
}).done($.proxy(function (data) {
32+
var tmpl = mageTemplate(this.options.systemMessageTemplate, {
33+
data: {
34+
items: data
35+
}
36+
});
37+
38+
tmpl = $(tmpl);
39+
2840
this.element.html(
29-
$('<ul />', {'class': "message-system-list"}).append(
30-
$.tmpl(this.options.systemMessageTemplate, data)
31-
)
41+
$('<ul />', {
42+
'class': 'message-system-list'
43+
}).append(tmpl)
3244
).trigger('contentUpdated');
45+
3346
superMethod();
3447
}, this));
48+
3549
return this;
3650
}
3751
});
3852

39-
$(document).ready(function(){
40-
$('#system_messages .message-system-short .error').on('click', function() {
53+
$(document).ready(function () {
54+
$('#system_messages .message-system-short .error').on('click', function () {
4155
$('#message-system-all').systemMessageDialog('open', 1);
4256
});
43-
$('#system_messages .message-system-short .warning').on('click', function() {
57+
58+
$('#system_messages .message-system-short .warning').on('click', function () {
4459
$('#message-system-all').systemMessageDialog('open', 2);
4560
});
4661
});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@
4747
$this->createRules()->setData(
4848
[
4949
'role_id' => $admGroupRole->getId(),
50-
'resource_id' => 'Magento_Adminhtml::all',
50+
'resource_id' => 'Magento_Backend::all',
5151
'privileges' => null,
5252
'permission' => 'allow',
5353
]
5454
)->save();
5555
} else {
5656
/** @var \Magento\Authorization\Model\Rules $rule */
5757
foreach ($rulesCollection as $rule) {
58-
$rule->setData('resource_id', 'Magento_Adminhtml::all')->save();
58+
$rule->setData('resource_id', 'Magento_Backend::all')->save();
5959
}
6060
}

‎app/code/Magento/Backend/Block/Dashboard.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function _prepareLayout()
3131

3232
$this->addChild('sales', 'Magento\Backend\Block\Dashboard\Sales');
3333

34-
if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
34+
if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
3535
$block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
3636
} else {
3737
$block = $this->getLayout()->createBlock(

‎app/code/Magento/Backend/Block/Dashboard/Graph.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public function getChartUrl($directUrl = true)
210210

211211
$timezoneLocal = $this->_scopeConfig->getValue(
212212
$this->_localeDate->getDefaultTimezonePath(),
213-
\Magento\Framework\Store\ScopeInterface::SCOPE_STORE
213+
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
214214
);
215215

216216
list($dateStart, $dateEnd) = $this->_collectionFactory->create()->getDateRange(

‎app/code/Magento/Backend/Block/Page/Header.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,6 @@ public function getLogoutLink()
8080
*/
8181
public function displayNoscriptNotice()
8282
{
83-
return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
83+
return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
8484
}
8585
}

0 commit comments

Comments
 (0)