Skip to content

Commit 2375a49

Browse files
author
rossbrandon
committed
Merge remote-tracking branch 'origin/MAGETWO-83013-ReleaseNotification' into MAGETWO-83013-ReleaseNotification
2 parents c92a21b + 52b06d1 commit 2375a49

File tree

5 files changed

+14
-4
lines changed

5 files changed

+14
-4
lines changed

app/code/Magento/ReleaseNotification/Controller/Adminhtml/Notification/MarkUserNotified.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,9 @@ public function execute()
8484
$resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
8585
return $resultJson->setData($responseContent);
8686
}
87+
88+
protected function _isAllowed()
89+
{
90+
return parent::_isAllowed();
91+
}
8792
}

app/code/Magento/ReleaseNotification/Test/Unit/Controller/Notification/MarkUserNotifiedTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
/**
2323
* Class MarkUserNotifiedTest
24+
*
25+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2426
*/
2527
class MarkUserNotifiedTest extends \PHPUnit\Framework\TestCase
2628
{

app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function testIsVisible($expected, $version, $lastViewVersion)
109109
->willReturn($this->logMock);
110110
$this->cacheStorageMock->expects($this->once())
111111
->method('save')
112-
->with(false,'release-notification-popup-1');
112+
->with(false, 'release-notification-popup-1');
113113
$this->assertEquals($expected, $this->canViewNotification->isVisible([]));
114114
}
115115

app/code/Magento/ReleaseNotification/view/adminhtml/web/js/modal/component.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
define([
67
'jquery',
78
'Magento_Ui/js/modal/modal-component',
@@ -16,6 +17,7 @@ define([
1617
logAction: '${ $.provider }:data.logAction'
1718
}
1819
},
20+
1921
/**
2022
* Error handler.
2123
*
@@ -36,7 +38,9 @@ define([
3638
*/
3739
logReleaseNotesShow: function () {
3840
var self = this,
39-
data = {"form_key": window.FORM_KEY};
41+
data = {
42+
'form_key': window.FORM_KEY
43+
};
4044

4145
$.ajax({
4246
type: 'POST',
@@ -51,7 +55,7 @@ define([
5155
},
5256

5357
/**
54-
*
58+
* Close release notes
5559
*/
5660
closeReleaseNotes: function () {
5761
this.logReleaseNotesShow();

dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/_files/controller_acl_test_whitelist_ce.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,3 @@ Magento\Swatches\Controller\Adminhtml\Product\Attribute\Plugin\Save
2828
Magento\Ui\Controller\Adminhtml\Export\GridToCsv
2929
Magento\Ui\Controller\Adminhtml\Export\GridToXml
3030
Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter
31-
Magento\ReleaseNotification\Controller\Adminhtml\Notification\MarkUserNotified

0 commit comments

Comments
 (0)