diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2020-09-02 10:02:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-02 10:02:12 +0300 |
| commit | 11f54ee6389bd8ac408385b0d1760936c496470c (patch) | |
| tree | 92d398822189d5ccdc842fa6e1c996c7347ebf11 /plugins/Installation/Controller.php | |
| parent | 67d3486533579cb57c30e38074611c3ae80e9161 (diff) | |
Provide more debug information in system check (#16350)
* Provide more debug information in system check
* hide some info in screenshots
* try overriding some columns
* hide tr instead of only the content
* trying to get tests to work
* try different way
* try fix tests
* make sure cookie exists
* add overridejs to install
* more tweaks
* fix test
* more tweaks
* move things to DI
* minor tweaks
* minor tweaks
* fix test
* also anonymise DB username
* Update Twig.php
* Improve query performance
* Fix ClientTest keywords
Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>
Diffstat (limited to 'plugins/Installation/Controller.php')
| -rw-r--r-- | plugins/Installation/Controller.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index 2640efc26d..f6ff09a163 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -492,7 +492,6 @@ class Controller extends \Piwik\Plugin\ControllerAdmin /** @var DiagnosticService $diagnosticService */ $diagnosticService = StaticContainer::get('Piwik\Plugins\Diagnostics\DiagnosticService'); $view->diagnosticReport = $diagnosticService->runDiagnostics(); - return $view->render(); } @@ -562,6 +561,11 @@ class Controller extends \Piwik\Plugin\ControllerAdmin 'plugins/Installation/javascripts/installation.js', ); + if (defined('PIWIK_TEST_MODE') && PIWIK_TEST_MODE + && file_exists(PIWIK_DOCUMENT_ROOT . '/tests/resources/screenshot-override/override.js')) { + $files[] = 'tests/resources/screenshot-override/override.js'; + } + return AssetManager::compileCustomJs($files); } |