Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit c07e5bb

Browse files
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - magento/magento2#15767: [Backport] FIX fo rissue #15510 - First PDF download / export after login (by @sanjay-wagento) - magento/magento2#15797: [Backport] Removed unnecessary css. #3 (by @chirag-wagento) - magento/magento2#15796: [Backport] [Resolved : Styling <select> by changing less variables in Luma theme� (by @hitesh-wagento) - magento/magento2#15801: [Backport] Prevent multiple add-to-cart initializations in case of ajax loaded product listing (by @viral-wagento) - magento/magento2#15855: [Backport 2.1] Fixed return type hinting in DocBlocks for Wishlist module (by @rogyar) - magento/magento2#15841: [Backport] Fix for issue 911 found on MSI project - Cannot read property source_� #15 (by @chirag-wagento) - magento/magento2#15776: [Backport] Added additional headers for avoiding customer data caching (by @rogyar) Fixed GitHub Issues: - magento/magento2#15510: First PDF download / export after login (reported by @anthony-jullien) has been fixed in magento/magento2#15767 by @sanjay-wagento in 2.1-develop branch Related commits: 1. 8e43c07 - magento/magento2#15608: Styling <select> by changing less variables in Luma theme doesn't work as expected (reported by @denistrator) has been fixed in magento/magento2#15796 by @hitesh-wagento in 2.1-develop branch Related commits: 1. d3184ac
2 parents b1f7b25 + 1b810a5 commit c07e5bb

File tree

12 files changed

+25
-15
lines changed

12 files changed

+25
-15
lines changed

app/code/Magento/Backend/App/AbstractAction.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
214214
$this->_view->loadLayout(['default', 'adminhtml_denied'], true, true, false);
215215
$this->_view->renderLayout();
216216
$this->_request->setDispatched(true);
217+
217218
return $this->_response;
218219
}
219220

@@ -223,6 +224,11 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
223224

224225
$this->_processLocaleSettings();
225226

227+
// Need to preload isFirstPageAfterLogin (see https://github.com/magento/magento2/issues/15510)
228+
if ($this->_auth->isLoggedIn()) {
229+
$this->_auth->getAuthStorage()->isFirstPageAfterLogin();
230+
}
231+
226232
return parent::dispatch($request);
227233
}
228234

app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ define([
3333

3434
_bindSubmit: function() {
3535
var self = this;
36+
if (this.element.data('catalog-addtocart-initialized')) {
37+
return;
38+
}
39+
this.element.data('catalog-addtocart-initialized', 1);
3640
this.element.on('submit', function(e) {
3741
e.preventDefault();
3842
self.submitForm($(this));

app/code/Magento/Customer/Controller/Section/Load.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ public function execute()
6161
{
6262
/** @var \Magento\Framework\Controller\Result\Json $resultJson */
6363
$resultJson = $this->resultJsonFactory->create();
64+
$resultJson->setHeader('Cache-Control', 'max-age=0, must-revalidate, no-cache, no-store', true);
65+
$resultJson->setHeader('Pragma', 'no-cache', true);
6466
try {
6567
$sectionNames = $this->getRequest()->getParam('sections');
6668
$sectionNames = $sectionNames ? array_unique(\explode(',', $sectionNames)) : null;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,8 @@ define([
104104
* @param {String|Number} recordId
105105
*/
106106
deleteRecord: function (index, recordId) {
107-
this._super();
108-
109107
this.updateInsertData(recordId);
108+
this._super();
110109
},
111110

112111
/**

app/code/Magento/Wishlist/Block/Rss/EmailLink.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class EmailLink extends Link
2222
protected $_template = 'rss/email.phtml';
2323

2424
/**
25-
* @return string
25+
* @return array
2626
*/
2727
protected function getLinkParams()
2828
{

app/code/Magento/Wishlist/Block/Rss/Link.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function isRssAllowed()
6969
}
7070

7171
/**
72-
* @return string
72+
* @return array
7373
*/
7474
protected function getLinkParams()
7575
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ public function isAllowInCart()
500500
/**
501501
* Retrieve customer name
502502
*
503-
* @return string|void
503+
* @return string|null
504504
*/
505505
public function getCustomerName()
506506
{

app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
&:last-child {
2323
margin-bottom: 0;
2424
}
25-
26-
&.primary {
27-
// &:extend(.abs-button-l all);
28-
}
2925
}
3026

3127
&:last-child {

app/design/frontend/Magento/luma/web/css/source/_forms.less

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,7 @@
9191
.select-styling() {
9292
.lib-css(appearance, none, 1);
9393
appearance: none;
94-
background: @select__background url('../images/select-bg.svg') no-repeat 100% 45%;
9594
background-size: 30px 60px;
96-
border: 1px solid @border-color__base;
97-
height: 32px;
98-
padding-right: 25px;
9995
text-indent: .01em;
10096
text-overflow: '';
10197

app/design/frontend/Magento/luma/web/css/source/_theme.less

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,13 @@
153153
// Forms
154154
// ---------------------------------------------
155155

156+
157+
// Select
158+
@select__background: @form-element-input__background url('../images/select-bg.svg') no-repeat 100% 45%;
159+
@select__border: 1px solid @border-color__base;
160+
@select__height: 32px;
161+
@select__padding: 4px 25px @indent__xs @indent__s;
162+
156163
// Form fieldset
157164
@form-fieldset-legend__font-size: 18px;
158165
@form-fieldset-legend__font-weight: @font-weight__light;

dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
101101
private function validatePropertiesSorting(PHP_CodeSniffer_File $phpcsFile, $stackPtr, array $properties)
102102
{
103103
// Fix needed for cases when incorrect properties passed for validation due to bug in PHP tokens.
104-
$symbolsForSkip = ['(', 'block'];
104+
$symbolsForSkip = ['(', 'block', 'field'];
105105
$properties = array_filter(
106106
$properties,
107107
function ($var) use ($symbolsForSkip) {

lib/web/css/source/lib/variables/_forms.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
@select__disabled__font-style: @form-element-input__disabled__font-style;
122122

123123
// Focus state
124-
@select__focus__background: @form-element-input__focus__background;
124+
@select__focus__background: false;
125125
@select__focus__border: @form-element-input__focus__border;
126126
@select__focus__color: @form-element-input__focus__color;
127127
@select__focus__font-style: @form-element-input__focus__font-style;

0 commit comments

Comments
 (0)