Revert "[TASK] Add Category model and repository"

This reverts commit 544f5b0.
pixelant · Jan 16, 2018 · 2e823b9 · 2e823b9
1 parent f7bf10f
commit 2e823b9
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 90 deletions.
diff --git a/Classes/Controller/ItemController.php b/Classes/Controller/ItemController.php
@@ -45,7 +45,7 @@ class ItemController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController
     /**
      * categoryRepository
      *
-     * @var    \Pixelant\PxaItemList\Domain\Repository\CategoryRepository
+     * @var    \TYPO3\CMS\Extbase\Domain\Repository\CategoryRepository
      * @inject
      */
     protected $categoryRepository = null;

diff --git a/Classes/Domain/Model/Category.php b/Classes/Domain/Model/Category.php
diff --git a/Classes/Domain/Model/Item.php b/Classes/Domain/Model/Item.php
@@ -34,7 +34,7 @@ class Item extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
     /**
      * Categories
      *
-     * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Pixelant\PxaItemList\Domain\Model\Category>
+     * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\Category>
      */
     protected $categories = null;
 
@@ -348,7 +348,7 @@ public function setPdf(\TYPO3\CMS\Extbase\Domain\Model\FileReference $pdf)
     /**
      * Adds a Category
      *
-     * @param  \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Pixelant\PxaItemList\Domain\Model\Category> $category
+     * @param  \TYPO3\CMS\Extbase\Domain\Model\Category $category
      * @return void
      */
     public function addCategory(\TYPO3\CMS\Extbase\Domain\Model\Category $category)
@@ -359,7 +359,7 @@ public function addCategory(\TYPO3\CMS\Extbase\Domain\Model\Category $category)
     /**
      * Removes a Category
      *
-     * @param  \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Pixelant\PxaItemList\Domain\Model\Category> $categoryToRemove
+     * @param  \TYPO3\CMS\Extbase\Domain\Model\Category $categoryToRemove The Category to be removed
      * @return void
      */
     public function removeCategory(\TYPO3\CMS\Extbase\Domain\Model\Category $categoryToRemove)
@@ -375,6 +375,10 @@ public function removeCategory(\TYPO3\CMS\Extbase\Domain\Model\Category $categor
     public function getCategoriesUidList()
     {
         $cateroiesUids = [];
+
+        /**
+ * @var Category $category
+*/
         foreach ($this->getCategories() as $category) {
             $cateroiesUids[] = $category->getUid();
         }
@@ -390,6 +394,10 @@ public function getCategoriesUidList()
     public function getCategoriesTitleList()
     {
         $cateroiesTitles = [];
+
+        /**
+ * @var Category $category
+*/
         foreach ($this->getCategories() as $category) {
             $cateroiesTitles[] = $category->getTitle();
         }
@@ -400,7 +408,7 @@ public function getCategoriesTitleList()
     /**
      * Returns the categories
      *
-     * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Pixelant\PxaItemList\Domain\Model\Category> $categories
+     * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\Category> $categories
      */
     public function getCategories()
     {
@@ -410,7 +418,7 @@ public function getCategories()
     /**
      * Sets the categories
      *
-     * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Pixelant\PxaItemList\Domain\Model\Category> $categories
+     * @param  \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\Category> $categories
      * @return void
      */
     public function setCategories(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $categories)

diff --git a/Classes/Domain/Repository/CategoryRepository.php b/Classes/Domain/Repository/CategoryRepository.php
diff --git a/Configuration/TCA/tx_pxaitemlist_domain_model_item.php b/Configuration/TCA/tx_pxaitemlist_domain_model_item.php
@@ -33,8 +33,7 @@
         '1' => array(
             'showitem' => 'sys_language_uid;;;;1-1-1, l10n_parent, l10n_diffsource, hidden;;1, name,'.
             ' year, customer, product_choice, architect, consultant, installer, description, image,'.
-            ' pdf, date, --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access, starttime, endtime,'.
-            ' --div--;LLL:EXT:lang/locallang_tca.xlf:sys_category.tabs.category, categories'
+            ' pdf, date, --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access, starttime, endtime'
         ),
     ),
     'palettes' => array(

diff --git a/Configuration/TypoScript/setup.txt b/Configuration/TypoScript/setup.txt
@@ -53,17 +53,7 @@ plugin.tx_pxaitemlist_item {
         translateJsLabels {
             1 = label.none
         }
-    }
-
-    # map back your model to extbase category table
-    persistence.classes {
-        Pixelant\PxaItemList\Domain\Model\Category {
-            mapping {
-                recordType = 0
-                    tableName = sys_category
-            }
-        }
-    }
+	}
 }
 
 # Include css

diff --git a/Resources/Private/Language/.DS_Store b/Resources/Private/Language/.DS_Store
diff --git a/Resources/Private/Partials/.DS_Store b/Resources/Private/Partials/.DS_Store
diff --git a/Resources/Private/Templates/.DS_Store b/Resources/Private/Templates/.DS_Store
diff --git a/Resources/Public/Icons/.DS_Store b/Resources/Public/Icons/.DS_Store
diff --git a/ext_tables.sql b/ext_tables.sql
@@ -6,7 +6,6 @@ CREATE TABLE tx_pxaitemlist_domain_model_item (
 	uid int(11) NOT NULL auto_increment,
 	pid int(11) DEFAULT '0' NOT NULL,
 
-	categories int(11) unsigned DEFAULT '0' NOT NULL,
 	name varchar(255) DEFAULT '' NOT NULL,
 	year int(11) unsigned DEFAULT '0' NOT NULL,
 	customer varchar(255) DEFAULT '' NOT NULL,
@@ -47,3 +46,10 @@ CREATE TABLE tx_pxaitemlist_domain_model_item (
  KEY language (l10n_parent,sys_language_uid)
 
 );
+
+#
+# Table structure for table 'tx_pxaitemlist_domain_model_item'
+#
+CREATE TABLE tx_pxaitemlist_domain_model_item (
+	categories int(11) unsigned DEFAULT '0' NOT NULL,
+);