Skip to content

Commit 3bd1c44

Browse files
author
Oleksii Korshenko
authored
Merge pull request #661 from magento-east/MAGETWO-62032
Fixed issue: - MAGETWO-62032: Empty default website error
2 parents 1df63f4 + b171b5e commit 3bd1c44

File tree

1 file changed

+9
-1
lines changed
  • app/code/Magento/Backend/Block/System/Store/Edit/Form

1 file changed

+9
-1
lines changed

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
108108
);
109109
}
110110

111-
if (!$websiteModel->getIsDefault() && $websiteModel->getStoresCount()) {
111+
if ($this->checkIsSingleAndIsDefaultStore($websiteModel)) {
112112
$fieldset->addField(
113113
'is_default',
114114
'checkbox',
@@ -133,4 +133,12 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
133133
['name' => 'website[website_id]', 'value' => $websiteModel->getId()]
134134
);
135135
}
136+
137+
private function checkIsSingleAndIsDefaultStore($websiteModel)
138+
{
139+
$hasOnlyDefaultStore = $websiteModel->getStoresCount() == 1 &&
140+
isset($websiteModel->getStoreIds()[\Magento\Store\Model\Store::DEFAULT_STORE_ID]);
141+
142+
return !$websiteModel->getIsDefault() && $websiteModel->getStoresCount() && !$hasOnlyDefaultStore;
143+
}
136144
}

0 commit comments

Comments
 (0)