Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Customer-data is not updates after login when full page cache disabled #6473

Closed
wants to merge 4 commits into from
Closed

Customer-data is not updates after login when full page cache disabled #6473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10ac0ef
Update customer-data when Full page cache disabled
ihor-sviziev Sep 2, 2016
dccf8c8
Update customer-data when Full page cache disabled
ihor-sviziev May 23, 2017
4ebc6f2
Update customer-data when Full page cache disabled
ihor-sviziev May 23, 2017
c13585b
Merge remote-tracking branch 'remotes/origin/develop' into patch-3
ihor-sviziev May 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions app/code/Magento/Customer/view/frontend/web/js/customer-data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,8 @@ define([
var countryData,
privateContent = $.cookieStorage.get('private_content_version');

if (_.isEmpty(storage.keys())) {
if (!_.isEmpty(privateContent)) {
this.reload([], false);
}
if (_.isEmpty(storage.keys()) && !_.isEmpty(privateContent)) {
this.reload([], false);
} else if (this.needReload()) {
_.each(dataProvider.getFromStorage(storage.keys()), function (sectionData, sectionName) {
buffer.notify(sectionName, sectionData);
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ public function aroundDispatch(
\Closure $proceed,
\Magento\Framework\App\RequestInterface $request
) {
$this->version->process();
if (!$this->config->isEnabled() || $this->config->getType() != \Magento\PageCache\Model\Config::BUILT_IN) {
return $proceed($request);
}
$this->version->process();
$result = $this->kernel->load();
if ($result === false) {
$result = $proceed($request);
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/PageCache/Test/Unit/Model/App/FrontController/BuiltinPluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public function testAroundDispatchDisabled($state)
->method('isEnabled')
->will($this->returnValue(true));
$this->versionMock
->expects($this->once())
->expects($this->never())
->method('process');
$this->stateMock->expects($this->any())
->method('getMode')
Expand Down