Skip to content

Commit 4a4db58

Browse files
EliasKotlyarEliasKotlyar
committed
Compatiblity to SUPEE-6788
1 parent 263c01c commit 4a4db58

File tree

9 files changed

+21
-20
lines changed

9 files changed

+21
-20
lines changed

‎app/code/community/Hackathon/MageMonitoring/Block/Tab/Config.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ protected function _getHeader()
131131
*/
132132
public function getSaveUrl()
133133
{
134-
return $this->getUrl('*/widgetAjax/saveTabConfig');
134+
return $this->getUrl('*/mageMonitoring_widgetAjax/saveTabConfig');
135135
}
136136

137137
/**
@@ -141,7 +141,7 @@ public function getSaveUrl()
141141
*/
142142
public function getEditWidgetConfigFormUrl()
143143
{
144-
return $this->getUrl('*/widgetAjax/getWidgetConfigForm');
144+
return $this->getUrl('*/mageMonitoring_widgetAjax/getWidgetConfigForm');
145145
}
146146

147147
/**

‎app/code/community/Hackathon/MageMonitoring/Block/Tab/Config/Form/WidgetConf.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ protected function _prepareForm()
119119
}
120120
$fieldset->addField($k, $c['type'], $fieldParams);
121121
}
122-
$postUrl = Mage::helper('magemonitoring')->getWidgetUrl('*/widgetAjax/saveWidgetConf', $widget);
122+
$postUrl = Mage::helper('magemonitoring')->getWidgetUrl('*/mageMonitoring_widgetAjax/saveWidgetConf', $widget);
123123
$this->setChild('form_after',
124124
$this->getLayout()->createBlock('adminhtml/widget_button')->setData(array(
125125
'label' => Mage::helper('magemonitoring')->__('Save'),

‎app/code/community/Hackathon/MageMonitoring/Block/Widget.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public function getOutput()
150150
*/
151151
public function getConfigUrl()
152152
{
153-
return Mage::helper('magemonitoring')->getWidgetUrl('*/widgetAjax/getWidgetConf', $this->_getWidget());
153+
return Mage::helper('magemonitoring')->getWidgetUrl('*/mageMonitoring_widgetAjax/getWidgetConf', $this->_getWidget());
154154
}
155155

156156
/**
@@ -160,7 +160,7 @@ public function getConfigUrl()
160160
*/
161161
public function getCallbackUrl()
162162
{
163-
return Mage::helper('magemonitoring')->getWidgetUrl('*/widgetAjax/execCallback', $this->_getWidget());
163+
return Mage::helper('magemonitoring')->getWidgetUrl('*/mageMonitoring_widgetAjax/execCallback', $this->_getWidget());
164164
}
165165

166166
/**
@@ -170,6 +170,6 @@ public function getCallbackUrl()
170170
*/
171171
public function getRefreshUrl()
172172
{
173-
return Mage::helper('magemonitoring')->getWidgetUrl('*/widgetAjax/refreshWidget', $this->_getWidget());
173+
return Mage::helper('magemonitoring')->getWidgetUrl('*/mageMonitoring_widgetAjax/refreshWidget', $this->_getWidget());
174174
}
175175
}

‎app/code/community/Hackathon/MageMonitoring/Block/Widget/Button.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function setOnClick($widget, $controllerAction, $urlParams = null, $confi
4848
$widgetId = $widget->getConfigId();
4949
$tabId = $widget->getTabId();
5050
$widgetName = $widget->getName();
51-
$callbackUrl = Mage::helper('magemonitoring')->getWidgetUrl('*/widgetAjax/execCallback', $widget);
51+
$callbackUrl = Mage::helper('magemonitoring')->getWidgetUrl('*/mageMonitoring_widgetAjax/execCallback', $widget);
5252
$refreshUrl = 'null';
5353
// check if refresh flag is set
5454
if (isset($urlParams['refreshAfter']) && $urlParams['refreshAfter']) {

app/code/community/Hackathon/MageMonitoring/controllers/Adminhtml/MonitoringController.php renamed to app/code/community/Hackathon/MageMonitoring/controllers/Adminhtml/MageMonitoring/MonitoringController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* @package FireGento_MageMonitoring
2727
* @author FireGento Team <team@firegento.com>
2828
*/
29-
class Hackathon_MageMonitoring_Adminhtml_MonitoringController extends Mage_Adminhtml_Controller_Action
29+
class Hackathon_MageMonitoring_Adminhtml_MageMonitoring_MonitoringController extends Mage_Adminhtml_Controller_Action
3030
{
3131
/**
3232
* Index action

app/code/community/Hackathon/MageMonitoring/controllers/Adminhtml/WidgetAjaxController.php renamed to app/code/community/Hackathon/MageMonitoring/controllers/Adminhtml/MageMonitoring/WidgetAjaxController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* @package FireGento_MageMonitoring
2727
* @author FireGento Team <team@firegento.com>
2828
*/
29-
class Hackathon_MageMonitoring_Adminhtml_WidgetAjaxController extends Mage_Adminhtml_Controller_Action
29+
class Hackathon_MageMonitoring_Adminhtml_MageMonitoring_WidgetAjaxController extends Mage_Adminhtml_Controller_Action
3030
{
3131

3232
/**

‎app/code/community/Hackathon/MageMonitoring/etc/adminhtml.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<magemonitoring translate="title" module="magemonitoring">
2828
<title>Monitoring</title>
2929
<sort_order>20</sort_order>
30-
<action>monitoring/monitoring</action>
30+
<action>adminhtml/mageMonitoring_monitoring/index</action>
3131
</magemonitoring>
3232
</children>
3333
</system>

‎app/code/community/Hackathon/MageMonitoring/etc/config.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,21 +133,22 @@
133133

134134
</global>
135135

136+
136137
<admin>
137138
<routers>
138-
<magemonitoring>
139-
<use>admin</use>
139+
<adminhtml>
140140
<args>
141-
<module>Hackathon_MageMonitoring</module>
142-
<frontName>monitoring</frontName>
143141
<modules>
144142
<magemonitoring before="Mage_Adminhtml">Hackathon_MageMonitoring_Adminhtml</magemonitoring>
145143
</modules>
146144
</args>
147-
</magemonitoring>
145+
</adminhtml>
148146
</routers>
149147
</admin>
150148

149+
150+
151+
151152
<adminhtml>
152153
<layout>
153154
<updates>

‎app/design/adminhtml/default/default/layout/monitoring.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
*/
2626
-->
2727
<layout>
28-
<magemonitoring_monitoring_index>
28+
<adminhtml_magemonitoring_monitoring_index>
2929
<update handle="monitoring_css_js" />
30-
</magemonitoring_monitoring_index>
30+
</adminhtml_magemonitoring_monitoring_index>
3131

32-
<magemonitoring_monitoring_config_tabs>
32+
<adminhtml_magemonitoring_monitoring_config_tabs>
3333
<update handle="monitoring_css_js" />
34-
</magemonitoring_monitoring_config_tabs>
34+
</adminhtml_magemonitoring_monitoring_config_tabs>
3535

3636
<monitoring_css_js>
3737
<reference name="head">
@@ -41,7 +41,7 @@
4141
<action method="addItem"><type>skin_js</type><script>monitoring/js/mh_widget.js</script></action>
4242
<action method="addJs"><script>chartjs/Chart.min.js</script></action>
4343
<action method="addJs"><script>modal/modalbox.js</script></action>
44-
44+
4545
<!-- Merged from HealthCheck Extension -->
4646
<action method="addItem"><type>skin_js</type><script>monitoring/js/jquery.js</script></action>
4747
<action method="addItem"><type>skin_js</type><script>monitoring/js/jquery.noconflict.js</script></action>

0 commit comments

Comments
 (0)