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

Jump to bottom

Rework for PR #16222 . #16393

Merged
merged 2 commits into from Jul 7, 2018
Merged

Rework for PR #16222 . #16393

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab3f767
Rework for PR https://github.com/magento/magento2/pull/16222 .
phoenix128 Jun 25, 2018
af78c2f
Test coverage for read only fields
phoenix128 Jun 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions app/code/Magento/Config/Model/Config.php
View file
Open in desktop
Expand Up @@ -5,8 +5,10 @@
*/
namespace Magento\Config\Model;

use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
use Magento\Config\Model\Config\Structure\Element\Group;
use Magento\Config\Model\Config\Structure\Element\Field;
use Magento\Framework\App\ObjectManager;

/**
* Backend config model
Expand Down Expand Up @@ -80,6 +82,11 @@ class Config extends \Magento\Framework\DataObject
*/
protected $_storeManager;

/**
* @var Config\Reader\Source\Deployed\SettingChecker
*/
private $settingChecker;

/**
* @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
* @param \Magento\Framework\Event\ManagerInterface $eventManager
Expand All @@ -88,6 +95,7 @@ class Config extends \Magento\Framework\DataObject
* @param \Magento\Config\Model\Config\Loader $configLoader
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param Config\Reader\Source\Deployed\SettingChecker|null $settingChecker
* @param array $data
*/
public function __construct(
Expand All @@ -98,6 +106,7 @@ public function __construct(
\Magento\Config\Model\Config\Loader $configLoader,
\Magento\Framework\App\Config\ValueFactory $configValueFactory,
\Magento\Store\Model\StoreManagerInterface $storeManager,
SettingChecker $settingChecker = null,
array $data = []
) {
parent::__construct($data);
Expand All @@ -108,6 +117,7 @@ public function __construct(
$this->_configLoader = $configLoader;
$this->_configValueFactory = $configValueFactory;
$this->_storeManager = $storeManager;
$this->settingChecker = $settingChecker ?: ObjectManager::getInstance()->get(SettingChecker::class);
}

/**
Expand Down Expand Up @@ -351,6 +361,16 @@ protected function _processGroup(
// use extra memory
$fieldsetData = [];
foreach ($groupData['fields'] as $fieldId => $fieldData) {
$isReadOnly = $this->settingChecker->isReadOnly(
$groupPath . '/' . $fieldId,
$this->getScope(),
$this->getScopeCode()
);

if ($isReadOnly) {
continue;
}

$field = $this->getField($sectionPath, $groupId, $fieldId);
/** @var \Magento\Framework\App\Config\ValueInterface $backendModel */
$backendModel = $field->hasBackendModel()
Expand Down