version 8.5.6

categoryMode configuration removed
bihor · Sep 23, 2019 · 3150a42 · 3150a42
1 parent 9710a19
commit 3150a42
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 98 deletions.
diff --git a/Classes/Task/CsvExportTask.php b/Classes/Task/CsvExportTask.php
@@ -68,6 +68,10 @@ class CsvExportTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	 */
 	protected $convert = 0;
 
+	/**
+	 * @var TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface
+	 */
+	protected $configurationManager;
 
 	/**
 	 * Get the value of the csv file
@@ -255,19 +259,35 @@ public function execute() {
 		$cat_del = $this->getCatdelimiter();	// Feldtrenner bei Kategorien
 		$convert = ($this->getConvert()) ? TRUE : FALSE;	// convert from UTF-8 to ASCII?
 		$text = $this->getHeader();
-		if ($convert)
-			$text = iconv('utf-8', 'iso-8859-1', $text);
+		if ($convert) $text = iconv('utf-8', 'iso-8859-1', $text);
 		$content = $text . $ln;					// header of the csv file
 		$cat_keys = array();					// uids of category names
 		$cat_parents = array();					// parent of the categories
 		$cat_rel = array();						// camaliga-category-relations
 		$cat_counts = array();					// count $cats categories
 		$i = 0;									// Counter
 
+		// Step 0: init
+		$configurationArray = [
+			'persistence' => [
+				'storagePid' => '',
+				'classes' => [
+					'Quizpalme\Camaliga\Domain\Model\Category' => [
+						'mapping' => [
+							'recordType' => 0,
+							'tableName' => 'sys_category'
+						]
+					]
+				]
+			]
+		];
+		$this->configurationManager = GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Configuration\\ConfigurationManager');
+		$this->configurationManager->setConfiguration($configurationArray);
+
 		// Step 1: select all categories of the current language
-		// TODO: ersetzen!
-		$categoriesUtility = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('Quizpalme\\Camaliga\\Utility\\AllCategories');
-		$all_cats = $categoriesUtility->getCategoriesarrayComplete($lang_uid);
+		$objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager');
+		$categoryRepository = $objectManager->get('Quizpalme\\Camaliga\\Domain\\Repository\\CategoryRepository');
+		$all_cats = $categoryRepository->getAllCats('sorting', 'asc', []);
 
 		// Step 2: store more category datas in arrays
 		foreach ($all_cats as $key => $one_cat) {

diff --git a/Classes/Utility/AllCategories.php b/Classes/Utility/AllCategories.php
diff --git a/Documentation/Configuration/Typoscript-reference/Index.rst b/Documentation/Configuration/Typoscript-reference/Index.rst
@@ -108,6 +108,9 @@ overrideFlexformSettingsIfEmpty           boolean        Override FlexForm setti
                                                          0: no.
 
                                                          1: yes (works good, except for checkboxes).
+settings.category.storagePids             string         Folder with categories. -1: all categories; empty: use normal folder.
+settings.category.sortBy                  string         Sort categories by: sorting (default), tstamp, crdate, title or uid.
+settings.category.orderBy                 string         Order categories by: asc (default) or desc.
 settings.img.width                        int            Width of the images. Can be used in the template.                                  700
 settings.img.height                       int            Height of the images. Can be used in the template.                                 500
 settings.img.thumbWidth                   int            Thumbnail width of the images. Can be used in the template.                        195

diff --git a/Documentation/Localization.de_DE/Konfiguration/Typoscript-referenz/Index.rst b/Documentation/Localization.de_DE/Konfiguration/Typoscript-referenz/Index.rst
@@ -113,6 +113,9 @@ settings.overrideFlexformSettingsIfEmpty  boolean        Überschreibe die FlexF
                                                          0: nein.
 
                                                          1: ja (funktioniert gut, außer bei den Checkbox-Einstellungen).
+settings.category.storagePids             string         Ordner mit den Kategorien. -1: alle Kategorien; Leer: normalen Ordner verwenden.
+settings.category.sortBy                  string         Kategorien sortieren nach: sorting (default), tstamp, crdate, title oder uid.
+settings.category.orderBy                 string         Kategorien ordnen nach: asc (default) oder desc.
 settings.img.width                        int            Breite eines Bildes. Kann im Template benutzt werden...                            700
 settings.img.height                       int            Höhe eines Bildes.                                                                 500
 settings.img.thumbWidth                   int            Thumbnail-Breite eines Bildes.                                                     195

diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # camaliga
 
-version 8.5.5
+version 8.5.6
 
 A carousel/gallery/map/list extension that can use the TYPO3 categories and different jQuery-plugins like Slick or Isotope. 
 Bootstrap support. Indexer for ke_search. Many features.
 
 You find the documentation at typo3.org:
 https://docs.typo3.org/typo3cms/extensions/camaliga/
 
-Last feature: beta version. Main changes for categories!
+Last feature: beta version. categoryMode configuration removed.
diff --git a/Resources/Private/Language/de.locallang_be.xlf b/Resources/Private/Language/de.locallang_be.xlf
@@ -165,15 +165,6 @@
 			<trans-unit id="default_categories">
 				<target>Ausgewählte Kategorien (bei erweiterten Templates: UND für radio-Buttons und ODER für Checkboxen):</target>
 			</trans-unit>
-			<trans-unit id="categoryMode">
-				<target>Kategorie-Modus:</target>
-			</trans-unit>
-			<trans-unit id="categoryMode.original">
-				<target>Benutze die Kategorie-Relationen der Original-Elemente</target>
-			</trans-unit>
-			<trans-unit id="categoryMode.translated">
-				<target>Benutze die Kategorie-Relationen der übersetzen Elemente (bugy)</target>
-			</trans-unit>
 			<trans-unit id="normalCategoryMode">
 				<target>Kategorie-Modus (bei normalen Templates):</target>
 			</trans-unit>

diff --git a/Resources/Private/Language/locallang_be.xlf b/Resources/Private/Language/locallang_be.xlf
@@ -168,15 +168,6 @@
 			<trans-unit id="default_categories">
 				<source>Selected default categories (for extended templates: AND for radio-buttons and OR for checkboxes):</source>
 			</trans-unit>
-			<trans-unit id="categoryMode">
-				<source>Category mode:</source>
-			</trans-unit>
-			<trans-unit id="categoryMode.translated">
-				<source>Use the category relations of translated elements (bugy)</source>
-			</trans-unit>
-			<trans-unit id="categoryMode.original">
-				<source>Use the category relations of the original element</source>
-			</trans-unit>
 			<trans-unit id="normalCategoryMode">
 				<source>Category mode (for normal templates):</source>
 			</trans-unit>

diff --git a/ext_conf_template.txt b/ext_conf_template.txt
@@ -1,6 +1,3 @@
-# cat=basic/enable; type=boolean; label=Ignore the category relations of translated elements:
-categoryMode = 1
-
 # cat=basic/enable; type=boolean; label=Do not switch controller and action at the ke_search hook?
 dontSwitchContAct = 0
 

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -14,7 +14,7 @@
   'title' => 'Camaliga: CArousel/MAp/LIst/GAllery',
   'description' => 'A carousel/gallery/map/list extension that can use the TYPO3 categories and different jQuery-plugins like Slick or Isotope. Bootstrap support. Indexer for ke_search. Many features! Big manual (even in german).',
   'category' => 'plugin',
-  'version' => '8.5.5',
+  'version' => '8.5.6',
   'state' => 'stable',
   'uploadfolder' => true,
   'createDirs' => '',