Merge pull request #24 from Silarn/master

Fix for Magento 1.9.2.2 / SUPEE-6788
magento-hackathon · Jan 27, 2016 · 27205e9 · 27205e9
2 parents 65f60b8 + 9bed130
commit 27205e9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/app/code/community/Hackathon/AsyncIndex/Model/Observer.php b/app/code/community/Hackathon/AsyncIndex/Model/Observer.php
@@ -57,13 +57,13 @@ protected function _changeActions(Mage_Index_Block_Adminhtml_Process_Grid $grid)
  ),
  array(
  'caption' => Mage::helper('index')->__('Schedule Reindex'),
- 'url' => array('base' => 'asyncindex/asyncindex/index'),
+ 'url' => array('base' => 'adminhtml/asyncindex/index'),
  'params' => array('_current' => true, '_secure' => false),
  'field' => 'process'
  ),
  array(
  'caption' => Mage::helper('index')->__('Schedule partial index'),
- 'url' => array('base' => 'asyncindex/asyncindex/schedulePartial'),
+ 'url' => array('base' => 'adminhtml/asyncindex/schedulePartial'),
  'params' => array('_current' => true, '_secure' => false),
  'field' => 'process'
  ),

diff --git a/...ndex/controllers/AsyncindexController.php → ...ollers/Adminhtml/AsyncindexController.php b/...ndex/controllers/AsyncindexController.php → ...ollers/Adminhtml/AsyncindexController.php
@@ -1,6 +1,6 @@
 <?php
 
-class Hackathon_AsyncIndex_AsyncindexController extends Mage_Adminhtml_Controller_Action
+class Hackathon_AsyncIndex_Adminhtml_AsyncindexController extends Mage_Adminhtml_Controller_Action
 {
 
  /**

diff --git a/app/code/community/Hackathon/AsyncIndex/etc/config.xml b/app/code/community/Hackathon/AsyncIndex/etc/config.xml
@@ -73,19 +73,18 @@
  <run>
  <model>hackathon_asyncindex/observer::runIndex</model>
  </run>
-
  </hackathon_asyncindex_events_cron>
  </jobs>
  </crontab>
  <admin>
  <routers>
- <asyncindex>
+ <adminhtml>
  <args>
- <module>Hackathon_AsyncIndex</module>
- <frontName>asyncindex</frontName>
+ <modules>
+ <Hackathon_AsyncIndex after="Mage_Adminhtml">Hackathon_AsyncIndex_Adminhtml</Hackathon_AsyncIndex>
+ </modules>
  </args>
- <use>admin</use>
- </asyncindex>
+ </adminhtml>
  </routers>
  </admin>
  <default>

diff --git a/app/design/adminhtml/default/default/template/hackathon/process_stats.phtml b/app/design/adminhtml/default/default/template/hackathon/process_stats.phtml
@@ -12,7 +12,7 @@
  <td><?php echo $code; ?></td>
  <td><?php echo $count; ?></td>
  <td><form action="<?php
- echo $this->getUrl('asyncindex/asyncindex/index',
+ echo $this->getUrl('adminhtml/asyncindex/index',
  array(
  '_current' => true,
  '_secure' => false,