From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 13 Oct 2012 23:05:15 +0000 (-0700)
Subject: Merge pull request #758 from Gravatronics/enhancement/actionInterface
X-Git-Tag: 2.0.0_Beta_1~885
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a0cfd3c986077c2d54f612f39f44761a9c5f0ff8;p=GitHub%2FWoltLab%2FWCF.git

Merge pull request #758 from Gravatronics/enhancement/actionInterface

Adds several interfaces for dbo actions
---

a0cfd3c986077c2d54f612f39f44761a9c5f0ff8
diff --cc wcfsetup/install/files/lib/data/category/CategoryAction.class.php
index 0d2c5833fd,9fab9e7974..ccc0190546
--- a/wcfsetup/install/files/lib/data/category/CategoryAction.class.php
+++ b/wcfsetup/install/files/lib/data/category/CategoryAction.class.php
@@@ -1,9 -1,11 +1,12 @@@
  <?php
  namespace wcf\data\category;
  use wcf\data\AbstractDatabaseObjectAction;
+ use wcf\data\ICollapsibleContainerAction;
+ use wcf\data\IPositionAction;
+ use wcf\data\IToggleAction;
  use wcf\system\category\CategoryHandler;
  use wcf\system\exception\PermissionDeniedException;
 +use wcf\system\exception\SystemException;
  use wcf\system\exception\ValidateActionException;
  use wcf\system\user\collapsible\content\UserCollapsibleContentHandler;
  use wcf\system\WCF;
@@@ -51,15 -53,10 +54,15 @@@ class CategoryAction extends AbstractDa
  	}
  	
  	/**
- 	 * Toggles the collapse status of categories.
+ 	 * @see	wcf\data\ICollapsibleContainerAction::toggleContainer()
  	 */
  	public function toggleContainer() {
 -		$objectTypeID = UserCollapsibleContentHandler::getInstance()->getObjectTypeID($this->objects[0]->getCategoryType()->getCollapsibleObjectTypeName());
 +		$collapsibleObjectTypeName = $this->objects[0]->getCategoryType()->getObjectTypeName('com.woltlab.wcf.collapsibleContent');
 +		if ($collapsibleObjectTypeName === null) {
 +			throw new SystemException("Categories of this type don't support collapsing");
 +		}
 +		
 +		$objectTypeID = UserCollapsibleContentHandler::getInstance()->getObjectTypeID($collapsibleObjectTypeName);
  		$collapsedCategories = UserCollapsibleContentHandler::getInstance()->getCollapsedContent($objectTypeID);
  		
  		$categoryID = $this->objects[0]->categoryID;