From de2220754ca8b55868d2fe7be56312f181d7c8a3 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Thu, 7 Sep 2017 17:01:49 +1200 Subject: [PATCH] Add upgrade exclusion rules --- code/forms/SubsitesTreeDropdownField.php | 6 ++++++ code/model/Subsite.php | 4 ++++ code/pages/SubsitesVirtualPage.php | 1 + 3 files changed, 11 insertions(+) diff --git a/code/forms/SubsitesTreeDropdownField.php b/code/forms/SubsitesTreeDropdownField.php index 523de47..b67571a 100644 --- a/code/forms/SubsitesTreeDropdownField.php +++ b/code/forms/SubsitesTreeDropdownField.php @@ -23,6 +23,12 @@ class SubsitesTreeDropdownField extends TreeDropdownField protected $subsiteID = 0; + /** + * Extra HTML classes + * + * @skipUpgrade + * @var string[] + */ protected $extraClasses = ['SubsitesTreeDropdownField']; public function Field($properties = []) diff --git a/code/model/Subsite.php b/code/model/Subsite.php index 8353930..9320a83 100644 --- a/code/model/Subsite.php +++ b/code/model/Subsite.php @@ -209,11 +209,13 @@ class Subsite extends DataObject $SQL_host = Convert::raw2sql($host); + /** @skipUpgrade */ if (!in_array('SubsiteDomain', DB::table_list())) { // Table hasn't been created yet. Might be a dev/build, skip. return 0; } + /** @skipUpgrade */ $matchingDomains = DataObject::get( SubsiteDomain::class, "'$SQL_host' LIKE replace(\"SubsiteDomain\".\"Domain\",'*','%')", @@ -394,6 +396,7 @@ class Subsite extends DataObject return self::$_cache_accessible_sites[$cacheKey]; } + /** @skipUpgrade */ $subsites = DataList::create(Subsite::class) ->where("\"Subsite\".\"Title\" != ''") ->leftJoin('Group_Subsites', '"Group_Subsites"."SubsiteID" = "Subsite"."ID"') @@ -415,6 +418,7 @@ class Subsite extends DataObject } /** @var DataList $rolesSubsites */ + /** @skipUpgrade */ $rolesSubsites = DataList::create(Subsite::class) ->where("\"Subsite\".\"Title\" != ''") ->leftJoin('Group_Subsites', '"Group_Subsites"."SubsiteID" = "Subsite"."ID"') diff --git a/code/pages/SubsitesVirtualPage.php b/code/pages/SubsitesVirtualPage.php index 541bf86..ce01a6e 100644 --- a/code/pages/SubsitesVirtualPage.php +++ b/code/pages/SubsitesVirtualPage.php @@ -52,6 +52,7 @@ class SubsitesVirtualPage extends VirtualPage 'Root.Main', DropdownField::create( 'CopyContentFromID_SubsiteID', + /** @skipUpgrade */ _t('SubsitesVirtualPage.SubsiteField', 'Subsite'), $subsites->map('ID', 'Title') )->addExtraClass('subsitestreedropdownfield-chooser no-change-track'),