Merge branch '1' into 2

This commit is contained in:
github-actions 2024-03-09 14:26:02 +00:00
commit c218df40b2
2 changed files with 12 additions and 2 deletions

View File

@ -48,7 +48,6 @@ BasicElementalPage:
Only:
moduleexists: 'silverstripe/linkfield'
---
SilverStripe\FrameworkTest\LinkField\PageTypes\LinkFieldTestPage:
extensions:
- SilverStripe\FrameworkTest\LinkField\Extensions\LinkPageExtension
@ -57,6 +56,13 @@ SilverStripe\FrameworkTest\Model\Company:
extensions:
- SilverStripe\FrameworkTest\LinkField\Extensions\CompanyExtension
---
Only:
moduleexists:
- 'silverstripe/linkfield'
- 'dnadesign/silverstripe-elemental'
---
SilverStripe\FrameworkTest\LinkField\Blocks\LinkFieldTestBlock:
extensions:
- SilverStripe\FrameworkTest\LinkField\Extensions\ElementContentExtension

View File

@ -4,6 +4,10 @@ namespace SilverStripe\FrameworkTest\LinkField\Blocks;
use DNADesign\Elemental\Models\BaseElement;
if (!class_exists(BaseElement::class)) {
return;
}
class LinkFieldTestBlock extends BaseElement
{
private static string $table_name = 'LinkFieldTestBlock';