tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ActionController: move moduleInit to Module controller

This commit is contained in:
Thomas Gelf 2014-06-22 13:54:02 +02:00
parent 2cd25b7376
commit de19745eb2
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/Icinga/Web/Controller/ActionController.php
View File

@ -121,7 +121,6 @@ class ActionController extends Zend_Controller_Action
} }
$this->view->tabs = new Tabs(); $this->view->tabs = new Tabs();
$this->moduleInit();
$this->init(); $this->init();
} }
@ -171,10 +170,6 @@ class ActionController extends Zend_Controller_Action
} }
} }
protected function moduleInit()
{
}
protected function reloadCss() protected function reloadCss()
{ {
$this->reloadCss = true; $this->reloadCss = true;

6
library/Icinga/Web/Controller/ModuleActionController.php
View File

@ -21,6 +21,7 @@ class ModuleActionController extends ActionController
parent::__construct($request, $response, $invokeArgs); parent::__construct($request, $response, $invokeArgs);
$this->moduleName = $request->getModuleName(); $this->moduleName = $request->getModuleName();
$this->view->translationDomain = $this->moduleName; $this->view->translationDomain = $this->moduleName;
$this->moduleInit();
} }
public function Config($file = null) public function Config($file = null)
@ -41,4 +42,9 @@ class ModuleActionController extends ActionController
return $this->configs[$file]; return $this->configs[$file];
} }
} }
protected function moduleInit()
{
}
} }