Skip to content

Commit 2e1981b

Browse files
author
Eric Bohanon
committed
MAGETWO-71257: Need to disable module output by configuration
- Fix DisableOutput deprecation tags and hide advanced config in UI.
1 parent 206379a commit 2e1981b

File tree

2 files changed

+51
-11
lines changed

2 files changed

+51
-11
lines changed

app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
@deprecated Magento does not support custom disabling/enabling modules output since 2.2.0 version.
2121
Section 'Advanced' was disabled. This section will be removed from code in one release.
2222
-->
23-
<section id="advanced" translate="label" type="text" sortOrder="910" showInDefault="1" showInWebsite="1" showInStore="1">
23+
<section id="advanced" translate="label" type="text" sortOrder="910" showInDefault="0" showInWebsite="0" showInStore="0">
2424
<label>Advanced</label>
2525
<tab>advanced</tab>
2626
<resource>Magento_Backend::advanced</resource>

app/code/Magento/Config/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php

Lines changed: 50 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,52 @@
1010
* on the store settings page.
1111
*
1212
* @method \Magento\Config\Block\System\Config\Form getForm()
13-
* @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
13+
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
14+
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
15+
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
16+
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
17+
* issues that will be addressed in future releases.
1418
* @api
1519
*/
1620
class DisableOutput extends \Magento\Config\Block\System\Config\Form\Fieldset
1721
{
1822
/**
1923
* @var \Magento\Framework\DataObject
20-
* @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
24+
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
25+
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
26+
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
27+
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
28+
* issues that will be addressed in future releases.
2129
*/
2230
protected $_dummyElement;
2331

2432
/**
2533
* @var \Magento\Config\Block\System\Config\Form\Field
26-
* @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
34+
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
35+
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
36+
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
37+
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
38+
* issues that will be addressed in future releases.
2739
*/
2840
protected $_fieldRenderer;
2941

3042
/**
3143
* @var array
32-
* @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
44+
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
45+
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
46+
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
47+
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
48+
* issues that will be addressed in future releases.
3349
*/
3450
protected $_values;
3551

3652
/**
3753
* @var \Magento\Framework\Module\ModuleListInterface
38-
* @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
54+
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
55+
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
56+
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
57+
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
58+
* issues that will be addressed in future releases.
3959
*/
4060
protected $_moduleList;
4161

@@ -59,7 +79,11 @@ public function __construct(
5979

6080
/**
6181
* {@inheritdoc}
62-
* @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
82+
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
83+
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
84+
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
85+
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
86+
* issues that will be addressed in future releases.
6387
*/
6488
public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
6589
{
@@ -88,7 +112,11 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
88112
}
89113

90114
/**
91-
* @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
115+
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
116+
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
117+
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
118+
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
119+
* issues that will be addressed in future releases.
92120
* @return \Magento\Framework\DataObject
93121
*/
94122
protected function _getDummyElement()
@@ -100,7 +128,11 @@ protected function _getDummyElement()
100128
}
101129

102130
/**
103-
* @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
131+
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
132+
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
133+
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
134+
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
135+
* issues that will be addressed in future releases.
104136
* @return \Magento\Config\Block\System\Config\Form\Field
105137
*/
106138
protected function _getFieldRenderer()
@@ -114,7 +146,11 @@ protected function _getFieldRenderer()
114146
}
115147

116148
/**
117-
* @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
149+
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
150+
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
151+
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
152+
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
153+
* issues that will be addressed in future releases.
118154
* @return array
119155
*/
120156
protected function _getValues()
@@ -131,7 +167,11 @@ protected function _getValues()
131167
/**
132168
* @param \Magento\Framework\Data\Form\Element\Fieldset $fieldset
133169
* @param string $moduleName
134-
* @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
170+
* @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
171+
* version. Module output can still be enabled/disabled in configuration files. However, this functionality should
172+
* not be used in future development. Module design should explicitly state dependencies to avoid requiring output
173+
* disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
174+
* issues that will be addressed in future releases.
135175
* @return mixed
136176
*/
137177
protected function _getFieldHtml($fieldset, $moduleName)

0 commit comments

Comments
 (0)