Merge branch 'release/12.1.0'

sebastianstein · sebastianstein · commit 92a24291bbf9 · 2025-07-07T08:28:19.000+02:00
diff --git a/Classes/Domain/Repository/AbstractRepository.php b/Classes/Domain/Repository/AbstractRepository.php
@@ -4,8 +4,12 @@
 
 namespace In2code\In2studyfinder\Domain\Repository;
 
+use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 use TYPO3\CMS\Extbase\Persistence\Repository;
 
 class AbstractRepository extends Repository
 {
+    protected $defaultOrderings = [
+        'sorting' => QueryInterface::ORDER_ASCENDING
+    ];
 }
diff --git a/Classes/Domain/Service/CourseService.php b/Classes/Domain/Service/CourseService.php
@@ -81,7 +81,7 @@ public function setPageTitleAndMetadata(StudyCourseInterface $studyCourse): void
         }
         if (!empty($studyCourse->getMetaKeywords())) {
             $metaTagManager->getManagerForProperty('keywords')->addProperty(
-                'description',
+                'keywords',
                 $studyCourse->getMetaKeywords()
             );
         }
diff --git a/Configuration/TCA/tx_in2studyfinder_domain_model_academicdegree.php b/Configuration/TCA/tx_in2studyfinder_domain_model_academicdegree.php
@@ -21,6 +21,7 @@
         'transOrigPointerField' => 'l10n_parent',
         'transOrigDiffSourceField' => 'l10n_diffsource',
         'delete' => 'deleted',
+        'sortby' => 'sorting',
         'enablecolumns' => [
             'disabled' => 'hidden',
             'starttime' => 'starttime',
diff --git a/Configuration/TCA/tx_in2studyfinder_domain_model_admissionrequirement.php b/Configuration/TCA/tx_in2studyfinder_domain_model_admissionrequirement.php
@@ -21,6 +21,7 @@
         'transOrigPointerField' => 'l10n_parent',
         'transOrigDiffSourceField' => 'l10n_diffsource',
         'delete' => 'deleted',
+        'sortby' => 'sorting',
         'enablecolumns' => [
             'disabled' => 'hidden',
             'starttime' => 'starttime',
diff --git a/Configuration/TCA/tx_in2studyfinder_domain_model_courselanguage.php b/Configuration/TCA/tx_in2studyfinder_domain_model_courselanguage.php
@@ -21,6 +21,7 @@
         'transOrigPointerField' => 'l10n_parent',
         'transOrigDiffSourceField' => 'l10n_diffsource',
         'delete' => 'deleted',
+        'sortby' => 'sorting',
         'enablecolumns' => [
             'disabled' => 'hidden',
             'starttime' => 'starttime',
diff --git a/Configuration/TCA/tx_in2studyfinder_domain_model_department.php b/Configuration/TCA/tx_in2studyfinder_domain_model_department.php
@@ -20,6 +20,7 @@
         'transOrigPointerField' => 'l10n_parent',
         'transOrigDiffSourceField' => 'l10n_diffsource',
         'delete' => 'deleted',
+        'sortby' => 'sorting',
         'enablecolumns' => [
             'disabled' => 'hidden',
             'starttime' => 'starttime',
diff --git a/Configuration/TCA/tx_in2studyfinder_domain_model_faculty.php b/Configuration/TCA/tx_in2studyfinder_domain_model_faculty.php
@@ -21,6 +21,7 @@
         'transOrigPointerField' => 'l10n_parent',
         'transOrigDiffSourceField' => 'l10n_diffsource',
         'delete' => 'deleted',
+        'sortby' => 'sorting',
         'enablecolumns' => [
             'disabled' => 'hidden',
             'starttime' => 'starttime',
diff --git a/Configuration/TCA/tx_in2studyfinder_domain_model_graduation.php b/Configuration/TCA/tx_in2studyfinder_domain_model_graduation.php
@@ -20,6 +20,7 @@
         'transOrigPointerField' => 'l10n_parent',
         'transOrigDiffSourceField' => 'l10n_diffsource',
         'delete' => 'deleted',
+        'sortby' => 'sorting',
         'enablecolumns' => [
             'disabled' => 'hidden',
             'starttime' => 'starttime',
diff --git a/Configuration/TCA/tx_in2studyfinder_domain_model_startofstudy.php b/Configuration/TCA/tx_in2studyfinder_domain_model_startofstudy.php
@@ -21,6 +21,7 @@
         'transOrigPointerField' => 'l10n_parent',
         'transOrigDiffSourceField' => 'l10n_diffsource',
         'delete' => 'deleted',
+        'sortby' => 'sorting',
         'enablecolumns' => [
             'disabled' => 'hidden',
             'starttime' => 'starttime',
diff --git a/Configuration/TCA/tx_in2studyfinder_domain_model_typeofstudy.php b/Configuration/TCA/tx_in2studyfinder_domain_model_typeofstudy.php
@@ -21,6 +21,7 @@
         'transOrigPointerField' => 'l10n_parent',
         'transOrigDiffSourceField' => 'l10n_diffsource',
         'delete' => 'deleted',
+        'sortby' => 'sorting',
         'enablecolumns' => [
             'disabled' => 'hidden',
             'starttime' => 'starttime',
diff --git a/readme.md b/readme.md
@@ -241,6 +241,7 @@ ddev ssh
 
 | Version | Date       | State        | Description                                                                                                                                                                                                                                   |
 |---------|------------|--------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 12.1.0  | 2025-07-07 | FEATURE      | Allow backend sorting of filter items, set correct meta tag property type for keywords. For further information see: [Commits](https://github.com/in2code-de/in2studyfinder/commits/12.1.0)                                                   |
 | 12.0.2  | 2025-05-23 | BUGFIX       | Add missing release preparations                                                                                                                                                                                                              |
 | 12.0.1  | 2025-05-23 | BUGFIX       | Fix ajax requests in non default language                                                                                                                                                                                                     |
 | 12.0.0  | 2025-02-10 | [!!!]TASK    | Update JavaScript event handling, Minor bugfixes, for further information see: [Commits](https://github.com/in2code-de/in2studyfinder/commits/12.0.0)                                                                                         |

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,12 @@`
`4`	`4`
`5`	`5`	`namespace In2code\In2studyfinder\Domain\Repository;`
`6`	`6`
	`7`	`+use TYPO3\CMS\Extbase\Persistence\QueryInterface;`
`7`	`8`	`use TYPO3\CMS\Extbase\Persistence\Repository;`
`8`	`9`
`9`	`10`	`class AbstractRepository extends Repository`
`10`	`11`	`{`
	`12`	`+ protected $defaultOrderings = [`
	`13`	`+ 'sorting' => QueryInterface::ORDER_ASCENDING`
	`14`	`+ ];`
`11`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function setPageTitleAndMetadata(StudyCourseInterface $studyCourse): void`
`81`	`81`	`}`
`82`	`82`	`if (!empty($studyCourse->getMetaKeywords())) {`
`83`	`83`	`$metaTagManager->getManagerForProperty('keywords')->addProperty(`
`84`		`- 'description',`
	`84`	`+ 'keywords',`
`85`	`85`	`$studyCourse->getMetaKeywords()`
`86`	`86`	`);`
`87`	`87`	`}`