diff --git a/Classes/Domain/Model/TemporalEntity.php b/Classes/Domain/Model/TemporalEntity.php index e068141..4d7ea64 100644 --- a/Classes/Domain/Model/TemporalEntity.php +++ b/Classes/Domain/Model/TemporalEntity.php @@ -100,14 +100,6 @@ class TemporalEntity extends AbstractEntity */ protected $description; - /** - * LOD statements about the temporal entity - * - * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Digicademy\Vocabulary\Domain\Model\Statements> - * @lazy - */ - protected $statements = null; - /** * Returns the persistentIdentifier * @@ -306,26 +298,4 @@ public function setDescription($description) $this->description = $description; } - /** - * Returns the statements - * - * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Digicademy\Vocabulary\Domain\Model\Statements> $statements - */ - public function getStatements() - { - return $this->statements; - } - - /** - * Sets the statements - * - * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Digicademy\Vocabulary\Domain\Model\Statements> $statements - * - * @return void - */ - public function setStatements($statements) - { - $this->statements = $statements; - } - } diff --git a/Configuration/TCA/tx_chftime_domain_model_temporal_entity.php b/Configuration/TCA/tx_chftime_domain_model_temporal_entity.php index 271cd06..7b93751 100644 --- a/Configuration/TCA/tx_chftime_domain_model_temporal_entity.php +++ b/Configuration/TCA/tx_chftime_domain_model_temporal_entity.php @@ -7,7 +7,7 @@ 'ctrl' => array( 'title' => 'LLL:EXT:chf_time/Resources/Private/Language/locallang_db.xlf:tx_chftime_domain_model_temporal_entity', 'label' => 'name', - 'sortby' => 'sorting', + 'default_sortby' => 'ORDER BY name', 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', @@ -37,8 +37,7 @@ date_range, spatial_extent, source, - description, - statements + description ', ), 'types' => array( @@ -54,8 +53,7 @@ date_range, spatial_extent, source, - description, - statements, + description --div--;LLL:EXT:chf_time/Resources/Private/Language/locallang_db.xlf:tx_chftime_domain_model_temporal_entity.div2, sys_language_uid, l10n_parent, @@ -276,59 +274,5 @@ 'eval' => 'trim' ), ), - 'statements' => array( - 'exclude' => 1, - 'label' => 'LLL:EXT:chf_time/Resources/Private/Language/locallang_db.xml:tx_chftime_domain_model_temporal_entity.statements', - 'config' => array( - 'type' => 'group', - 'internal_type' => 'db', - 'allowed' => 'tx_vocabulary_domain_model_statements', - 'foreign_table' => 'tx_vocabulary_domain_model_statements', - 'MM' => 'tx_vocabulary_statements_records_mm', - 'MM_match_fields' => array( - // ident field as workaround for possible bug in line 544 of \TYPO3\CMS\Core\Database\RelationHandler - // tablenames must be name of foreign table (statements) whereas ident is needed to distinguish between records from different tables - // otherwise relations are not kept/displayed correctly in this field - 'ident' => 'tx_chftime_domain_model_temporal_entity', - 'tablenames' => 'tx_vocabulary_domain_model_statements', - 'fieldname' => 'statements', - ), - 'size' => 10, - 'minitems' => 0, - 'maxitems' => 9999, - 'wizards' => array( - 'suggest' => array( - 'type' => 'suggest', - 'default' => array( - 'pidList' => '###PLACEHOLDER###', - ), - ), - 'add' => Array( - 'type' => 'popup', - 'title' => 'Create new', - 'icon' => 'actions-add', - 'params' => array( - 'table' => 'tx_vocabulary_domain_model_statements', - 'pid' => '###PAGE_TSCONFIG_ID###', - 'setValue' => 'prepend' - ), - 'JSopenParams' => 'height=350,width=580,status=0,menubar=0,scrollbars=1', - 'module' => array( - 'name' => 'wizard_add', - ), - ), - 'edit' => Array( - 'type' => 'popup', - 'title' => 'LLL:EXT:vocabulary/Resources/Private/Language/locallang_db.xlf:wizard_edit', - 'icon' => 'actions-open', - 'JSopenParams' => 'height=550,width=900,status=0,menubar=0,scrollbars=1', - 'popup_onlyOpenIfSelected' => 1, - 'module' => array( - 'name' => 'wizard_edit', - ), - ), - ), - ), - ), ), ); diff --git a/Configuration/TSConfig/setup.txt b/Configuration/TSConfig/setup.txt index 191a8bc..9843378 100644 --- a/Configuration/TSConfig/setup.txt +++ b/Configuration/TSConfig/setup.txt @@ -3,11 +3,6 @@ TCEFORM { # pages with temporal entity records parent.PAGE_TSCONFIG_IDLIST = 1 - - # page for LOD statements created with new wizard - statements.PAGE_TSCONFIG_ID = 1 - # pages for LOD statements suggest wizard - statements.suggest.default.pidList = 1 } tx_chftime_domain_model_dateranges { diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf index 5ad8b1b..3d666ea 100755 --- a/Resources/Private/Language/de.locallang_db.xlf +++ b/Resources/Private/Language/de.locallang_db.xlf @@ -154,10 +154,6 @@ Description Beschreibung - - LOD Statements - LOD Statements - diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf index 4f82741..49af193 100755 --- a/Resources/Private/Language/locallang_db.xlf +++ b/Resources/Private/Language/locallang_db.xlf @@ -106,9 +106,6 @@ Description - - LOD Statements - diff --git a/ext_emconf.php b/ext_emconf.php index 2e1fe8b..c271c52 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -17,7 +17,6 @@ 'depends' => array( 'typo3' => '7.6.0-8.7.99', 'chf_geo' => '', - 'vocabulary' => '', ), 'conflicts' => array(), 'suggests' => array(), diff --git a/ext_tables.sql b/ext_tables.sql index 31bbdc7..0818f83 100644 --- a/ext_tables.sql +++ b/ext_tables.sql @@ -80,15 +80,11 @@ CREATE TABLE tx_chftime_domain_model_temporal_entity ( # tx_chfgeo_domain_model_toponym (1:1) spatial_extent int(11) unsigned DEFAULT '0', - # tx_vocabulary_domain_model_statements (m:n) - statements int(11) unsigned DEFAULT '0', - tstamp int(11) unsigned DEFAULT '0' NOT NULL, crdate int(11) unsigned DEFAULT '0' NOT NULL, cruser_id int(11) DEFAULT '0' NOT NULL, deleted tinyint(4) unsigned DEFAULT '0' NOT NULL, hidden tinyint(4) unsigned DEFAULT '0' NOT NULL, - sorting int(11) unsigned DEFAULT '0' NOT NULL, t3_origuid int(11) DEFAULT '0' NOT NULL, t3ver_oid int(11) DEFAULT '0' NOT NULL, @@ -113,8 +109,7 @@ CREATE TABLE tx_chftime_domain_model_temporal_entity ( KEY name (name), KEY parent (parent), KEY date_range (date_range), - KEY spatial_extent (spatial_extent), - KEY statements (statements) + KEY spatial_extent (spatial_extent) ) ENGINE=InnoDB;