Skip to content

Commit 59931bc

Browse files
balex13balex13
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-66374
2 parents 643d3ca + e0bd129 commit 59931bc

File tree

218 files changed

+1477
-1292
lines changed

Some content is hidden

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

218 files changed

+1477
-1292
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<block class="Magento\AdminNotification\Block\Window"
1717
name="notification_window"
1818
as="notification_window"
19-
acl="Magento_AdminNotification::show_toolbar"
19+
aclResource="Magento_AdminNotification::show_toolbar"
2020
template="Magento_AdminNotification::notification/window.phtml"/>
2121
</referenceContainer>
2222
<referenceContainer name="header">

‎app/code/Magento/Analytics/Model/Condition/CanViewNotification.php

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
namespace Magento\Analytics\Model\Condition;
87

9-
use Magento\Backend\Model\View\Layout\ConditionInterface;
8+
use Magento\Framework\View\Layout\Condition\VisibilityConditionInterface;
109
use Magento\Analytics\Model\NotificationTime;
1110
use Magento\Framework\Intl\DateTimeFactory;
1211

@@ -16,8 +15,13 @@
1615
* Dynamic validator for UI signUp notification form, manage Ui component visibility.
1716
* Return true if last notification was shipped seven days ago.
1817
*/
19-
class CanViewNotification implements ConditionInterface
18+
class CanViewNotification implements VisibilityConditionInterface
2019
{
20+
/**
21+
* Unique condition name.
22+
*/
23+
const NAME = 'can_view_notification';
24+
2125
/**
2226
* Time interval in seconds
2327
*
@@ -52,9 +56,9 @@ public function __construct(
5256
/**
5357
* Validate is notification popup can be shown
5458
*
55-
* @return bool
59+
* @inheritdoc
5660
*/
57-
public function validate()
61+
public function isVisible(array $arguments)
5862
{
5963
$lastNotificationTime = $this->notificationTime->getLastTimeNotification();
6064
if (!$lastNotificationTime) {
@@ -65,4 +69,12 @@ public function validate()
6569
$datetime->getTimestamp() >= $lastNotificationTime + $this->notificationInterval
6670
);
6771
}
72+
73+
/**
74+
* @return string
75+
*/
76+
public function getName()
77+
{
78+
return self::NAME;
79+
}
6880
}

‎app/code/Magento/Analytics/Test/Unit/Model/Condition/CanViewNotificationTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function testValidate()
6666
$this->dateTimeMock->expects($this->once())
6767
->method('getTimestamp')
6868
->willReturn(10005000);
69-
$this->assertTrue($this->canViewNotification->validate());
69+
$this->assertTrue($this->canViewNotification->isVisible([]));
7070
}
7171

7272
public function testValidateFlagRemoved()
@@ -76,6 +76,6 @@ public function testValidateFlagRemoved()
7676
->willReturn(null);
7777
$this->dateTimeFactoryMock->expects($this->never())
7878
->method('create');
79-
$this->assertFalse($this->canViewNotification->validate());
79+
$this->assertFalse($this->canViewNotification->isVisible([]));
8080
}
8181
}

‎app/code/Magento/Analytics/etc/di.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,6 @@
2323
</argument>
2424
</arguments>
2525
</type>
26-
<type name="Magento\Backend\Model\View\Layout\ConditionPool">
27-
<arguments>
28-
<argument name="conditions" xsi:type="array">
29-
<item name="analytics::can-view-notification" xsi:type="string">Magento\Analytics\Model\Condition\CanViewNotification</item>
30-
</argument>
31-
</arguments>
32-
</type>
3326
<type name="Magento\Analytics\Controller\Adminhtml\Subscription\Activate">
3427
<arguments>
3528
<argument name="configValueResource" xsi:type="object">Magento\Config\Model\ResourceModel\Config\Data</argument>

‎app/code/Magento/Analytics/view/adminhtml/layout/adminhtml_dashboard_index.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
1010
<body>
1111
<referenceContainer name="content">
12-
<uiComponent name="analytics_subscription_form" acl="Magento_Analytics::analytics_settings"
13-
condition="analytics::can-view-notification"/>
12+
<uiComponent name="analytics_subscription_form" aclResource="Magento_Analytics::analytics_settings">
13+
<visibilityCondition name="can_view_notification" className="Magento\Analytics\Model\Condition\CanViewNotification"/>
14+
</uiComponent>
1415
<block template="Magento_Analytics::dashboard/section.phtml"
1516
class="Magento\Backend\Block\Template"
1617
name="analytics_service_external_link"

‎app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
5959
$storeModel->setData($postData['store']);
6060
}
6161
$fieldset = $form->addFieldset('store_fieldset', ['legend' => __('Store View Information')]);
62-
6362
$storeAction = $this->_coreRegistry->registry('store_action');
6463
if ($storeAction == 'edit' || $storeAction == 'add') {
6564
$fieldset->addField(
@@ -76,7 +75,6 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
7675
);
7776
$fieldset = $this->prepareGroupIdField($form, $storeModel, $fieldset);
7877
}
79-
8078
$fieldset->addField(
8179
'store_name',
8280
'text',
@@ -99,7 +97,8 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
9997
'disabled' => $storeModel->isReadOnly()
10098
]
10199
);
102-
100+
$isDisabledStatusField = $storeModel->isReadOnly()
101+
|| ($storeModel->getId() && $storeModel->isDefault() && $storeModel->isActive());
103102
$fieldset->addField(
104103
'store_is_active',
105104
'select',
@@ -109,11 +108,19 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
109108
'value' => $storeModel->isActive(),
110109
'options' => [0 => __('Disabled'), 1 => __('Enabled')],
111110
'required' => true,
112-
'disabled' => $storeModel->isReadOnly()
113-
|| ($storeModel->getId() && $storeModel->isDefault() && $storeModel->isActive())
111+
'disabled' => $isDisabledStatusField
114112
]
115113
);
116-
114+
if ($isDisabledStatusField) {
115+
$fieldset->addField(
116+
'store_is_active_hidden',
117+
'hidden',
118+
[
119+
'name' => 'store[is_active]',
120+
'value' => $storeModel->isActive(),
121+
]
122+
);
123+
}
117124
$fieldset->addField(
118125
'store_sort_order',
119126
'text',
@@ -125,13 +132,11 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
125132
'disabled' => $storeModel->isReadOnly()
126133
]
127134
);
128-
129135
$fieldset->addField(
130136
'store_is_default',
131137
'hidden',
132138
['name' => 'store[is_default]', 'no_span' => true, 'value' => $storeModel->getIsDefault()]
133139
);
134-
135140
$fieldset->addField(
136141
'store_store_id',
137142
'hidden',

‎app/code/Magento/Backend/Model/View/Layout/ConditionInterface.php

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎app/code/Magento/Backend/Model/View/Layout/ConditionPool.php

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎app/code/Magento/Backend/Model/View/Layout/Filter.php

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)