Merge pull request #78 from sminnee/resource-loading

API: Remove REPORTS_DIR and its use.
This commit is contained in:
Ingo Schommer 2017-06-28 21:00:19 +12:00 committed by GitHub
commit 9e7108420b
2 changed files with 1 additions and 7 deletions

View File

@ -1,6 +0,0 @@
<?php
$path = explode(DIRECTORY_SEPARATOR, dirname(__FILE__));
$dir = $path[count($path) - 1];
define('REPORTS_DIR', $dir);

View File

@ -65,7 +65,7 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider
// Set custom options for TinyMCE specific to ReportAdmin
HTMLEditorConfig::get('cms')->setOption('content_css', project() . '/css/editor.css');
Requirements::javascript(REPORTS_DIR . '/javascript/ReportAdmin.js');
Requirements::javascript('silverstripe/reports: javascript/ReportAdmin.js');
}
/**