From 6ca6bff7e1417e9520ef4757da51259c5a228249 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Fri, 20 Jan 2023 17:11:08 +1300 Subject: [PATCH] MNT Remove legacy upgrader config --- .upgrade.yml | 18 ------------------ _config/legacy.yml | 6 ------ src/Extensions/SiteTreeContentReview.php | 1 - 3 files changed, 25 deletions(-) delete mode 100644 .upgrade.yml delete mode 100644 _config/legacy.yml diff --git a/.upgrade.yml b/.upgrade.yml deleted file mode 100644 index 6e73518..0000000 --- a/.upgrade.yml +++ /dev/null @@ -1,18 +0,0 @@ -mappings: - ContentReviewCompatability: SilverStripe\ContentReview\Compatibility\ContentReviewCompatability - ContentReviewCMSExtension: SilverStripe\ContentReview\Extensions\ContentReviewCMSExtension - ContentReviewDefaultSettings: SilverStripe\ContentReview\Extensions\ContentReviewDefaultSettings - ContentReviewOwner: SilverStripe\ContentReview\Extensions\ContentReviewOwner - SiteTreeContentReview: SilverStripe\ContentReview\Extensions\SiteTreeContentReview - ContentReviewNotificationJob: SilverStripe\ContentReview\Jobs\ContentReviewNotificationJob - ContentReviewLog: SilverStripe\ContentReview\Models\ContentReviewLog - PagesDueForReviewReport: SilverStripe\ContentReview\Reports\PagesDueForReviewReport - PagesWithoutReviewScheduleReport: SilverStripe\ContentReview\Reports\PagesWithoutReviewScheduleReport - ContentReviewEmails: SilverStripe\ContentReview\Tasks\ContentReviewEmails - ContentReviewOwnerMigrationTask: SilverStripe\ContentReview\Tasks\ContentReviewOwnerMigrationTask - ContentReviewBaseTest: SilverStripe\ContentReview\Tests\ContentReviewBaseTest - ContentReviewCMSPageEditControllerTest: SilverStripe\ContentReview\Tests\ContentReviewCMSPageEditControllerTest - ContentReviewNotificationTest: SilverStripe\ContentReview\Tests\ContentReviewNotificationTest - ContentReviewReportTest: SilverStripe\ContentReview\Tests\ContentReviewReportTest - ContentReviewSettingsTest: SilverStripe\ContentReview\Tests\ContentReviewSettingsTest - SiteTreeContentReviewTest: SilverStripe\ContentReview\Tests\SiteTreeContentReviewTest diff --git a/_config/legacy.yml b/_config/legacy.yml deleted file mode 100644 index 8db290e..0000000 --- a/_config/legacy.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -Name: contentreviewlegacy ---- -SilverStripe\ORM\DatabaseAdmin: - classname_value_remapping: - ContentReviewLog: SilverStripe\ContentReview\Models\ContentReviewLog diff --git a/src/Extensions/SiteTreeContentReview.php b/src/Extensions/SiteTreeContentReview.php index 8b6a648..074a6cc 100644 --- a/src/Extensions/SiteTreeContentReview.php +++ b/src/Extensions/SiteTreeContentReview.php @@ -142,7 +142,6 @@ public static function merge_owners(SS_List $groups, SS_List $members) $groupMembers = DataObject::get(Member::class) ->where("\"Group\".\"ID\" IN (" . implode(",", $groupIDs) . ")") ->leftJoin("Group_Members", "\"Member\".\"ID\" = \"Group_Members\".\"MemberID\"") - /** @skipUpgrade */ ->leftJoin('Group', "\"Group_Members\".\"GroupID\" = \"Group\".\"ID\""); $contentReviewOwners->merge($groupMembers);