Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Classes/EventListener/PreviewRenderingEventListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ public function __invoke(PageContentPreviewRenderingEvent $event): void
$record = $record->toArray();
}

/* keep v13 compatibility */
$listTypeField = isset($record['list_type']) ? 'list_type' : 'CType';
/* We assume migration to CType has been completed */
$listTypeField = 'CType';

if (!str_starts_with($record[$listTypeField] ?? '', 'calendarize_')) {
return;
Expand Down
10 changes: 10 additions & 0 deletions Classes/Updates/PluginUpdater.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@
use TYPO3\CMS\Core\Database\Connection;
use TYPO3\CMS\Core\Database\Query\QueryBuilder;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
use TYPO3\CMS\Core\Information\Typo3Version;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Install\Updates\DatabaseUpdatedPrerequisite;

/**
* This Upgrade wizard should have already been run previously. It will no longer work in TYPO3 v14 because
* the tt_content.list_type database field is missing. In TYPO3 v13, it should run before PluginListTypeToCTypeUpdate.
*/
#[UpgradeWizard('calendarize_pluginUpdater')]
class PluginUpdater extends AbstractUpdate
{
Expand Down Expand Up @@ -42,6 +47,7 @@ public function __construct(
protected readonly QueryBuilder $contentElementsQueryBuilder,
protected readonly QueryBuilder $backendGroupsQueryBuilder,
protected readonly FlexFormTools $flexFormTools,
protected readonly Typo3Version $typo3Version
) {}

/**
Expand Down Expand Up @@ -260,6 +266,10 @@ protected function getNewListTypesForGroupPermissions(): string

public function updateNecessary(): bool
{
// in TYPO3 v14 it is no longer possible to perform this wizard as the list_type field is missing!
if ($this->typo3Version->getMajorVersion() >= 14) {
return false;
}
return \count($this->getContentElementsToMigrate()) > 0 || \count($this->getBackendUserGroupsToMigrate()) > 0;
}

Expand Down
74 changes: 37 additions & 37 deletions Configuration/FlexForms/Calendar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
<label>LLL:EXT:calendarize/Resources/Private/Language/locallang.xlf:limit</label>
<displayCond>
<OR>
<numIndex index="0">FIELD:parentRec.list_type:=:calendarize_listdetail</numIndex>
<numIndex index="1">FIELD:parentRec.list_type:=:calendarize_list</numIndex>
<numIndex index="2">FIELD:parentRec.list_type:=:calendarize_latest</numIndex>
<numIndex index="3">FIELD:parentRec.list_type:=:calendarize_past</numIndex>
<numIndex index="0">FIELD:parentRec.CType:=:calendarize_listdetail</numIndex>
<numIndex index="1">FIELD:parentRec.CType:=:calendarize_list</numIndex>
<numIndex index="2">FIELD:parentRec.CType:=:calendarize_latest</numIndex>
<numIndex index="3">FIELD:parentRec.CType:=:calendarize_past</numIndex>
</OR>
</displayCond>
<config>
Expand All @@ -46,7 +46,7 @@

<settings.singleItems>
<label>LLL:EXT:calendarize/Resources/Private/Language/locallang.xlf:singleItems</label>
<displayCond>FIELD:parentRec.list_type:=:calendarize_single</displayCond>
<displayCond>FIELD:parentRec.CType:=:calendarize_single</displayCond>
<config>
<type>group</type>
<allowed>*</allowed>
Expand All @@ -59,11 +59,11 @@
<label>LLL:EXT:calendarize/Resources/Private/Language/locallang.xlf:hide.pagination.teaser</label>
<displayCond>
<OR>
<numIndex index="0">FIELD:parentRec.list_type:=:calendarize_listdetail</numIndex>
<numIndex index="1">FIELD:parentRec.list_type:=:calendarize_list</numIndex>
<numIndex index="2">FIELD:parentRec.list_type:=:calendarize_latest</numIndex>
<numIndex index="3">FIELD:parentRec.list_type:=:calendarize_result</numIndex>
<numIndex index="4">FIELD:parentRec.list_type:=:calendarize_past</numIndex>
<numIndex index="0">FIELD:parentRec.CType:=:calendarize_listdetail</numIndex>
<numIndex index="1">FIELD:parentRec.CType:=:calendarize_list</numIndex>
<numIndex index="2">FIELD:parentRec.CType:=:calendarize_latest</numIndex>
<numIndex index="3">FIELD:parentRec.CType:=:calendarize_result</numIndex>
<numIndex index="4">FIELD:parentRec.CType:=:calendarize_past</numIndex>
</OR>
</displayCond>
<config>
Expand All @@ -76,12 +76,12 @@
<displayCond>
<OR>

<numIndex index="0">FIELD:parentRec.list_type:=:calendarize_listdetail</numIndex>
<numIndex index="1">FIELD:parentRec.list_type:=:calendarize_list</numIndex>
<numIndex index="2">FIELD:parentRec.list_type:=:calendarize_latest</numIndex>
<numIndex index="3">FIELD:parentRec.list_type:=:calendarize_result</numIndex>
<numIndex index="4">FIELD:parentRec.list_type:=:calendarize_detail</numIndex>
<!-- <numIndex index="5">FIELD:parentRec.list_type:=:calendarize_past</numIndex> -->
<numIndex index="0">FIELD:parentRec.CType:=:calendarize_listdetail</numIndex>
<numIndex index="1">FIELD:parentRec.CType:=:calendarize_list</numIndex>
<numIndex index="2">FIELD:parentRec.CType:=:calendarize_latest</numIndex>
<numIndex index="3">FIELD:parentRec.CType:=:calendarize_result</numIndex>
<numIndex index="4">FIELD:parentRec.CType:=:calendarize_detail</numIndex>
<!-- <numIndex index="5">FIELD:parentRec.CType:=:calendarize_past</numIndex> -->
</OR>
</displayCond>
<config>
Expand All @@ -93,9 +93,9 @@
<label>LLL:EXT:calendarize/Resources/Private/Language/locallang.xlf:useRelativeDate</label>
<displayCond>
<OR>
<numIndex index="0">FIELD:parentRec.list_type:=:calendarize_listdetail</numIndex>
<numIndex index="1">FIELD:parentRec.list_type:=:calendarize_list</numIndex>
<numIndex index="2">FIELD:parentRec.list_type:=:calendarize_latest</numIndex>
<numIndex index="0">FIELD:parentRec.CType:=:calendarize_listdetail</numIndex>
<numIndex index="1">FIELD:parentRec.CType:=:calendarize_list</numIndex>
<numIndex index="2">FIELD:parentRec.CType:=:calendarize_latest</numIndex>
</OR>
</displayCond>
<onChange>reload</onChange>
Expand All @@ -109,9 +109,9 @@
<AND>
<numIndex index="0">FIELD:settings.useRelativeDate:REQ:false</numIndex>
<OR>
<numIndex index="0">FIELD:parentRec.list_type:=:calendarize_listdetail</numIndex>
<numIndex index="1">FIELD:parentRec.list_type:=:calendarize_list</numIndex>
<numIndex index="2">FIELD:parentRec.list_type:=:calendarize_latest</numIndex>
<numIndex index="0">FIELD:parentRec.CType:=:calendarize_listdetail</numIndex>
<numIndex index="1">FIELD:parentRec.CType:=:calendarize_list</numIndex>
<numIndex index="2">FIELD:parentRec.CType:=:calendarize_latest</numIndex>
</OR>
</AND>
</displayCond>
Expand All @@ -125,9 +125,9 @@
<AND>
<numIndex index="0">FIELD:settings.useRelativeDate:REQ:false</numIndex>
<OR>
<numIndex index="0">FIELD:parentRec.list_type:=:calendarize_listdetail</numIndex>
<numIndex index="1">FIELD:parentRec.list_type:=:calendarize_list</numIndex>
<numIndex index="2">FIELD:parentRec.list_type:=:calendarize_latest</numIndex>
<numIndex index="0">FIELD:parentRec.CType:=:calendarize_listdetail</numIndex>
<numIndex index="1">FIELD:parentRec.CType:=:calendarize_list</numIndex>
<numIndex index="2">FIELD:parentRec.CType:=:calendarize_latest</numIndex>
</OR>
</AND>
</displayCond>
Expand All @@ -141,9 +141,9 @@
<AND>
<numIndex index="0">FIELD:settings.useRelativeDate:REQ:true</numIndex>
<OR>
<numIndex index="0">FIELD:parentRec.list_type:=:calendarize_listdetail</numIndex>
<numIndex index="1">FIELD:parentRec.list_type:=:calendarize_list</numIndex>
<numIndex index="2">FIELD:parentRec.list_type:=:calendarize_latest</numIndex>
<numIndex index="0">FIELD:parentRec.CType:=:calendarize_listdetail</numIndex>
<numIndex index="1">FIELD:parentRec.CType:=:calendarize_list</numIndex>
<numIndex index="2">FIELD:parentRec.CType:=:calendarize_latest</numIndex>
</OR>
</AND>
</displayCond>
Expand All @@ -158,9 +158,9 @@
<AND>
<numIndex index="0">FIELD:settings.useRelativeDate:REQ:true</numIndex>
<OR>
<numIndex index="0">FIELD:parentRec.list_type:=:calendarize_listdetail</numIndex>
<numIndex index="1">FIELD:parentRec.list_type:=:calendarize_list</numIndex>
<numIndex index="2">FIELD:parentRec.list_type:=:calendarize_latest</numIndex>
<numIndex index="0">FIELD:parentRec.CType:=:calendarize_listdetail</numIndex>
<numIndex index="1">FIELD:parentRec.CType:=:calendarize_list</numIndex>
<numIndex index="2">FIELD:parentRec.CType:=:calendarize_latest</numIndex>
</OR>
</AND>
</displayCond>
Expand Down Expand Up @@ -189,7 +189,7 @@
<minitems>1</minitems>
<maxitems>99</maxitems>
</config>
<displayCond>FIELD:parentRec.list_type:!IN:calendarize_detail</displayCond>
<displayCond>FIELD:parentRec.CType:!IN:calendarize_detail</displayCond>
</settings.configuration>

<!-- Category Mode -->
Expand All @@ -215,7 +215,7 @@
</items>
<default>or</default>
</config>
<displayCond>FIELD:parentRec.list_type:!IN:calendarize_detail,calendarize_search,calendarize_result,calendarize_single</displayCond>
<displayCond>FIELD:parentRec.CType:!IN:calendarize_detail,calendarize_search,calendarize_result,calendarize_single</displayCond>
</settings.categoryConjunction>

<!-- Calendar configuration -->
Expand All @@ -239,7 +239,7 @@
</numIndex>
</items>
</config>
<displayCond>FIELD:parentRec.list_type:!=:calendarize_detail</displayCond>
<displayCond>FIELD:parentRec.CType:!=:calendarize_detail</displayCond>
</settings.sortBy>

<!-- Calendar configuration -->
Expand All @@ -259,7 +259,7 @@
</numIndex>
</items>
</config>
<displayCond>FIELD:parentRec.list_type:!=:calendarize_detail</displayCond>
<displayCond>FIELD:parentRec.CType:!=:calendarize_detail</displayCond>
</settings.sorting>

<!-- startingpoint -->
Expand All @@ -272,7 +272,7 @@
<maxitems>50</maxitems>
<minitems>0</minitems>
</config>
<displayCond>FIELD:parentRec.list_type:!IN:calendarize_detail,calendarize_single</displayCond>
<displayCond>FIELD:parentRec.CType:!IN:calendarize_detail,calendarize_single</displayCond>
</persistence.storagePid>

<!-- recursive -->
Expand Down Expand Up @@ -312,7 +312,7 @@
</numIndex>
</items>
</config>
<displayCond>FIELD:parentRec.list_type:!IN:calendarize_detail,calendarize_single</displayCond>
<displayCond>FIELD:parentRec.CType:!IN:calendarize_detail,calendarize_single</displayCond>
</persistence.recursive>
</el>
</ROOT>
Expand Down
131 changes: 0 additions & 131 deletions Configuration/TsConfig/Page/Mod/Wizards/NewContentElement.tsconfig

This file was deleted.

Loading