From b720acb705d5314cc6e1b03c8c27dbd1227d3649 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Wed, 11 Oct 2017 09:42:28 +1300 Subject: [PATCH] NEW Install module to the vendor folder --- composer.json | 8 ++++++-- src/Extensions/SiteTreeContentReview.php | 5 ++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 9a226eb..89f28b0 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "silverstripe/contentreview", - "type": "silverstripe-module", + "type": "silverstripe-vendormodule", "description": "Flags pages for periodical author review (incl. reporting)", "homepage": "http://silverstripe.org", "license": "BSD-3-Clause", @@ -20,6 +20,7 @@ } ], "require": { + "silverstripe/vendor-plugin": "^1.0", "silverstripe/framework": "^4@dev", "silverstripe/cms": "^4@dev", "silverstripe/reports": "^4@dev", @@ -38,7 +39,10 @@ "extra": { "branch-alias": { "dev-master": "4.0.x-dev" - } + }, + "expose": [ + "client/dist" + ] }, "autoload": { "psr-4": { diff --git a/src/Extensions/SiteTreeContentReview.php b/src/Extensions/SiteTreeContentReview.php index 5370a40..2e124ff 100644 --- a/src/Extensions/SiteTreeContentReview.php +++ b/src/Extensions/SiteTreeContentReview.php @@ -166,9 +166,8 @@ class SiteTreeContentReview extends DataExtension implements PermissionProvider return; } - $module = ModuleLoader::getModule('silverstripe/contentreview'); - Requirements::css($module->getRelativeResourcePath('client/dist/styles/contentreview.css')); - Requirements::javascript($module->getRelativeResourcePath('client/dist/js/contentreview.js')); + Requirements::css('silverstripe/contentreview:client/dist/styles/contentreview.css'); + Requirements::javascript('silverstripe/contentreview:client/dist/js/contentreview.js'); $reviewTab = LiteralField::create('ContentReviewButton', $this->owner->renderWith(__CLASS__ . '_button')); $actions->insertAfter('MajorActions', $reviewTab);