From 8d403a1d83fc7cf30c4ffb4f28481004f9b63fe1 Mon Sep 17 00:00:00 2001 From: Nicolaas / Sunny Side Up Date: Tue, 10 Jan 2023 10:16:09 +1300 Subject: [PATCH 1/4] PATCH: fixing jquery link to thirdparty/jquery-query/jquery.query.js --- code/Controllers/ContentController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/Controllers/ContentController.php b/code/Controllers/ContentController.php index 3fcb51f972..7e8b5c923e 100644 --- a/code/Controllers/ContentController.php +++ b/code/Controllers/ContentController.php @@ -352,7 +352,7 @@ public function SilverStripeNavigator() if (Director::isDev() || Permission::check('CMS_ACCESS_CMSMain') || Permission::check('VIEW_DRAFT_CONTENT')) { if ($this->dataRecord) { Requirements::css('silverstripe/cms: client/dist/styles/SilverStripeNavigator.css'); - Requirements::javascript('silverstripe/admin: thirdparty/jquery/jquery.js'); + Requirements::javascript('silverstripe/admin: thirdparty/jquery-query/jquery.query.js'); Requirements::javascript('silverstripe/cms: client/dist/js/SilverStripeNavigator.js'); $return = $nav = SilverStripeNavigator::get_for_record($this->dataRecord); From 79acadc0bba1b84c1d4d9f85d8a0281e3c10fb43 Mon Sep 17 00:00:00 2001 From: Nicolaas / Sunny Side Up Date: Thu, 12 Jan 2023 07:05:25 +1300 Subject: [PATCH 2/4] PATCH: remove jQuery reference --- code/Controllers/ContentController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/code/Controllers/ContentController.php b/code/Controllers/ContentController.php index 7e8b5c923e..bdfa42d7e7 100644 --- a/code/Controllers/ContentController.php +++ b/code/Controllers/ContentController.php @@ -352,7 +352,6 @@ public function SilverStripeNavigator() if (Director::isDev() || Permission::check('CMS_ACCESS_CMSMain') || Permission::check('VIEW_DRAFT_CONTENT')) { if ($this->dataRecord) { Requirements::css('silverstripe/cms: client/dist/styles/SilverStripeNavigator.css'); - Requirements::javascript('silverstripe/admin: thirdparty/jquery-query/jquery.query.js'); Requirements::javascript('silverstripe/cms: client/dist/js/SilverStripeNavigator.js'); $return = $nav = SilverStripeNavigator::get_for_record($this->dataRecord); From a51effa2acdcb3eed04949900ea987a0ee40076c Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Mon, 6 Nov 2023 16:27:45 +1300 Subject: [PATCH 3/4] TLN Update translations --- lang/fr.yml | 1 + lang/nl.yml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/lang/fr.yml b/lang/fr.yml index 2ea79b3810..f1c82396d7 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -267,6 +267,7 @@ fr: db_Sort: Tri db_Title: Titre db_URLSegment: 'Segment d''URL' + db_Version: Version has_one_Parent: 'Page parente' many_many_BackLinkTracking: 'Suivi des liens retour' many_many_ImageTracking: 'Suivi des images' diff --git a/lang/nl.yml b/lang/nl.yml index e48df45607..d6a232c366 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -289,6 +289,9 @@ nl: one: '1 pagina link' other: '{count} pagina links' SINGULARNAME: 'Pagina link' + has_one_Parent: Bovenliggende + SilverStripe\CMS\Model\SiteTreeLinkTracking: + many_many_LinkTracking: 'Links volgen' SilverStripe\CMS\Model\VirtualPage: CHOOSE: 'Gekoppelde pagina' DESCRIPTION: 'Toont de inhoud van een andere pagina' From dd2bd6138720587525a7d117b1593f6641650093 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 8 Nov 2023 11:55:30 +1300 Subject: [PATCH 4/4] FIX Limit Member map to 100 --- code/Model/SiteTree.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php index aefd7001c1..d8e169d432 100755 --- a/code/Model/SiteTree.php +++ b/code/Model/SiteTree.php @@ -2246,7 +2246,16 @@ public function getSettingsFields() }; $viewAllGroupsMap = $mapFn(Permission::get_groups_by_permission(['SITETREE_VIEW_ALL', 'ADMIN'])); $editAllGroupsMap = $mapFn(Permission::get_groups_by_permission(['SITETREE_EDIT_ALL', 'ADMIN'])); - $membersMap = Member::get()->map('ID', 'Name'); + + // $membersMap is limited to 100 records specifically so that it does not crash the front-end + // if the website has a large number of Members, which is likely to happen if the website also + // uses the Member table for non-cms public users + // This limit should be removed if the ListboxField front-end component is switched out or + // modified so that it does not load all users at once and instead uses XHR to fetch a subset + // of users based on what the user types in + $membersMap = Member::get() + ->limit(100) + ->map('ID', 'Name'); $fields = new FieldList( $rootTab = new TabSet(