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

Load additional static files for modules, really 

Since we're only processing the config script upon calling
Module::hasJs/Css() if no module.js or module.css exists,
we need to ensure that it's processed when calling
Module::getJS/CssFiles().

refs #9702
This commit is contained in:
Johannes Meyer 2015-08-10 10:00:02 +02:00
parent aa3cc9847d
commit 282aaa6e5b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/Application/Modules/Module.php
View File

@ -447,6 +447,7 @@ class Module
*/ */
public function getCssFiles() public function getCssFiles()
{ {
$this->launchConfigScript();
$files = $this->cssFiles; $files = $this->cssFiles;
$files[] = $this->getCssFilename(); $files[] = $this->getCssFilename();
return $files; return $files;
@ -497,6 +498,7 @@ class Module
*/ */
public function getJsFiles() public function getJsFiles()
{ {
$this->launchConfigScript();
$files = $this->jsFiles; $files = $this->jsFiles;
$files[] = $this->getJsFilename(); $files[] = $this->getJsFilename();
return $files; return $files;