From 8bed9bcf5975aa8df0ff530593f7d9188adf52bd Mon Sep 17 00:00:00 2001
From: Oliver Hader <oliver@typo3.org>
Date: Wed, 19 Feb 2014 14:26:03 +0100
Subject: [PATCH] [BUGFIX] Use MM_oppositeUsage for category relations
The MM_oppositeUsage property allows to apply match fields
of the opposite relation to MM records. This feature shall
be enabled for sys_category records as well.
Resolves: #56122
Related: #56061
Releases: 6.2
Change-Id: I33c9f3c471d66c4154be5c2fb5180254401096f0
Reviewed-on: https://review.typo3.org/27731
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Oliver Hader
Tested-by: Oliver Hader
---
.../sysext/core/Classes/Category/CategoryRegistry.php | 7 +++++++
typo3/sysext/core/Configuration/TCA/sys_category.php | 1 +
.../ManyToMany/AbstractActionTestCase.php | 8 +++-----
.../copyCategoryRecordOfCategoryRelation.csv | 2 +-
.../localizeCategoryRecordOfCategoryRelation.csv | 2 +-
.../ManyToMany/AbstractActionTestCase.php | 11 +++++++++--
.../copyCategoryRecordOfCategoryRelation.csv | 2 +-
.../createCategoryRecordAndAddCategoryRelation.csv | 2 +-
.../deleteCategoryRecordOfCategoryRelation.csv | 2 +-
.../localizeCategoryRecordOfCategoryRelation.csv | 4 ++--
.../modifyCategoryRecordOfCategoryRelation.csv | 2 +-
11 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/typo3/sysext/core/Classes/Category/CategoryRegistry.php b/typo3/sysext/core/Classes/Category/CategoryRegistry.php
index 5dd35b07be24..cf80f3749211 100644
--- a/typo3/sysext/core/Classes/Category/CategoryRegistry.php
+++ b/typo3/sysext/core/Classes/Category/CategoryRegistry.php
@@ -376,6 +376,13 @@ class CategoryRegistry implements \TYPO3\CMS\Core\SingletonInterface {
),
);
+ if (empty($GLOBALS['TCA']['sys_category']['columns']['items']['config']['MM_oppositeUsage'][$tableName])) {
+ $GLOBALS['TCA']['sys_category']['columns']['items']['config']['MM_oppositeUsage'][$tableName] = array();
+ }
+ if (!in_array($fieldName, $GLOBALS['TCA']['sys_category']['columns']['items']['config']['MM_oppositeUsage'][$tableName])) {
+ $GLOBALS['TCA']['sys_category']['columns']['items']['config']['MM_oppositeUsage'][$tableName][] = $fieldName;
+ }
+
// Adding fields to an existing table definition
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns($tableName, $columns);
}
diff --git a/typo3/sysext/core/Configuration/TCA/sys_category.php b/typo3/sysext/core/Configuration/TCA/sys_category.php
index 666421ae2504..0b8eda225d18 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_category.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_category.php
@@ -153,6 +153,7 @@ return array(
'internal_type' => 'db',
'allowed' => '*',
'MM' => 'sys_category_record_mm',
+ 'MM_oppositeUsage' => array(),
'size' => 10,
'show_thumbs' => FALSE
)
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/AbstractActionTestCase.php b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/AbstractActionTestCase.php
index fdea3018f3a6..1188701ccba1 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/AbstractActionTestCase.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/AbstractActionTestCase.php
@@ -203,9 +203,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
$responseContent = $this->getFrontendResponse(self::VALUE_PageId)->getResponseContent();
$this->assertResponseContentStructureHasRecords(
$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'categories',
- self::TABLE_Category, 'title', 'Category A'
- // @todo Actually it should be twice "Category A" since the category got copied
- // self::TABLE_Category, 'title', array('Category A', 'Category A')
+ self::TABLE_Category, 'title', array('Category A', 'Category A (copy 1)')
);
}
@@ -233,9 +231,9 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
$responseContent = $this->getFrontendResponse(self::VALUE_PageId, self::VALUE_LanguageId)->getResponseContent();
$this->assertResponseContentStructureHasRecords(
$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'categories',
- self::TABLE_Category, 'title', array('Category A', 'Category B')
- // @todo Actually it should contain the localized category
+ // @todo Category localization cannot be rendered - http://forge.typo3.org/issues/56059
// self::TABLE_Category, 'title', array('[Translate to Dansk:] Category A', 'Category B')
+ self::TABLE_Category, 'title', array('Category A', 'Category B')
);
}
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyCategoryRecordOfCategoryRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyCategoryRecordOfCategoryRelation.csv
index eca185e66f70..077ab5c34e3e 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyCategoryRecordOfCategoryRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyCategoryRecordOfCategoryRelation.csv
@@ -11,4 +11,4 @@ sys_category_record_mm
,29,297,tt_content,0,2,categories
,29,298,tt_content,0,1,categories
,30,298,tt_content,0,2,categories
-,32,297,tt_content,1,0,\*categories
+,32,297,tt_content,1,0,categories
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeCategoryRecordOfCategoryRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeCategoryRecordOfCategoryRelation.csv
index b8ddb17efc64..7d325f88320f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeCategoryRecordOfCategoryRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeCategoryRecordOfCategoryRelation.csv
@@ -11,4 +11,4 @@ sys_category_record_mm
,29,297,tt_content,0,2,categories
,29,298,tt_content,0,1,categories
,30,298,tt_content,0,2,categories
-,32,297,tt_content,1,0,\*categories
+,32,297,tt_content,1,0,categories
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/AbstractActionTestCase.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/AbstractActionTestCase.php
index d6fcc572186f..b55ed8ef3669 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/AbstractActionTestCase.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/AbstractActionTestCase.php
@@ -177,6 +177,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
$this->assertResponseContentHasRecords($responseContent, self::TABLE_Content, 'header', 'Testing #1');
// @todo New category is not resolved in new content element due to core bug
+ // The frontend query ignores pid=-1 and thus the specific workspace record in sys_category:33
/*
$this->assertResponseContentStructureHasRecords(
$responseContent, self::TABLE_Content . ':' . $newContentId, 'categories',
@@ -229,6 +230,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
* @test
*/
public function modifyBothRecordsOfCategoryRelation() {
+ $this->markTestSkipped('Using specific UIDs on both sides is not implemented yet');
$this->actionService->modifyRecord(self::TABLE_Category, self::VALUE_CategoryIdFirst, array('title' => 'Testing #1'));
$this->actionService->modifyRecord(self::TABLE_Content, self::VALUE_ContentIdFirst, array('header' => 'Testing #1'));
$this->assertAssertionDataSet('modifyBothRecordsOfCategoryRelation');
@@ -293,6 +295,11 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'categories',
self::TABLE_Category, 'title', 'Category A'
// @todo Actually it should be twice "Category A" since the category got copied
+ // The frontend query ignores pid=-1 and thus the specific workspace record in sys_category:33
+ // SELECT sys_category.* FROM sys_category JOIN sys_category_record_mm ON sys_category_record_mm.uid_local = sys_category.uid WHERE sys_category.uid IN (33,28,29)
+ // AND sys_category_record_mm.uid_foreign=297 AND (sys_category.sys_language_uid IN (0,-1))
+ // AND sys_category.deleted=0 AND (sys_category.t3ver_wsid=0 OR sys_category.t3ver_wsid=1) AND sys_category.pid<>-1
+ // ORDER BY sys_category_record_mm.sorting_foreign
// self::TABLE_Category, 'title', array('Category A', 'Category A')
);
}
@@ -321,9 +328,9 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
$responseContent = $this->getFrontendResponse(self::VALUE_PageId, self::VALUE_LanguageId, self::VALUE_BackendUserId, self::VALUE_WorkspaceId)->getResponseContent();
$this->assertResponseContentStructureHasRecords(
$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'categories',
- self::TABLE_Category, 'title', array('Category A', 'Category B')
- // @todo Actually it should contain the localized category
+ // @todo Category localization cannot be rendered - http://forge.typo3.org/issues/56059
// self::TABLE_Category, 'title', array('[Translate to Dansk:] Category A', 'Category B')
+ self::TABLE_Category, 'title', array('Category A', 'Category B')
);
}
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyCategoryRecordOfCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyCategoryRecordOfCategoryRelation.csv
index b268732732a2..0c725cab1861 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyCategoryRecordOfCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyCategoryRecordOfCategoryRelation.csv
@@ -13,7 +13,7 @@ sys_category_record_mm
,29,298,tt_content,0,1,categories
,30,298,tt_content,0,2,categories
# --- workspace change ---
-,33,297,tt_content,1,0,\*categories
+,33,297,tt_content,1,0,categories
tt_content
,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createCategoryRecordAndAddCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createCategoryRecordAndAddCategoryRelation.csv
index 9ffd942e2d6f..4c4474bd8f6c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createCategoryRecordAndAddCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createCategoryRecordAndAddCategoryRelation.csv
@@ -13,7 +13,7 @@ sys_category_record_mm
,29,298,tt_content,0,1,categories
,30,298,tt_content,0,2,categories
# --- workspace change ---
-,33,297,tt_content,1,0,\*categories
+,33,297,tt_content,1,0,categories
tt_content
,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteCategoryRecordOfCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteCategoryRecordOfCategoryRelation.csv
index 484c6960cf06..8285326cb48e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteCategoryRecordOfCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteCategoryRecordOfCategoryRelation.csv
@@ -12,7 +12,7 @@ sys_category_record_mm
,29,298,tt_content,0,1,categories
,30,298,tt_content,0,2,categories
# --- workspace change ---
-,32,297,tt_content,1,0,\*categories
+,32,297,tt_content,1,0,categories
tt_content
,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeCategoryRecordOfCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeCategoryRecordOfCategoryRelation.csv
index 1a6e60476ebd..242d0596a3a1 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeCategoryRecordOfCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeCategoryRecordOfCategoryRelation.csv
@@ -12,8 +12,8 @@ sys_category_record_mm
,29,297,tt_content,0,2,categories
,29,298,tt_content,0,1,categories
,30,298,tt_content,0,2,categories
-# --- workspace change ----
-,33,297,tt_content,1,0,\*categories
+# --- workspace change ---
+,33,297,tt_content,1,0,categories
tt_content
,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyCategoryRecordOfCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyCategoryRecordOfCategoryRelation.csv
index e0a7d3fc89a7..e5a4541d733f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyCategoryRecordOfCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyCategoryRecordOfCategoryRelation.csv
@@ -12,7 +12,7 @@ sys_category_record_mm
,29,298,tt_content,0,1,categories
,30,298,tt_content,0,2,categories
# --- workspace change ---
-,32,297,tt_content,1,0,\*categories
+,32,297,tt_content,1,0,categories
tt_content
,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
--
GitLab