Removes IPositionAction

Use ISearchAction instead!

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index aee14b23b1abd8e6a238000a685349dc1c46375c..4c1af8576e59ffbfb420581de32e027df61b1c2f 100755 (executable)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -5983,7 +5983,7 @@ WCF.Sortable.List = Class.extend({
                this._proxy.setOption('data', {
                        actionName: 'updatePosition',
                        className: this._className,
-                       interfaceName: 'wcf\\data\\IPositionAction',
+                       interfaceName: 'wcf\\data\\ISortableAction',
                        parameters: $parameters
                });
                this._proxy.sendRequest();

diff --git a/wcfsetup/install/files/lib/data/IPositionAction.class.php b/wcfsetup/install/files/lib/data/IPositionAction.class.php
deleted file mode 100644 (file)
index f0e5e81..0000000
--- a/wcfsetup/install/files/lib/data/IPositionAction.class.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-namespace wcf\data;
-
-/**
- * Every database object action whose objects can be positioned via AJAX has to
- * implement this interface.
- * 
- * @author     Matthias Schmidt
- * @copyright  2001-2012 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package    com.woltlab.wcf
- * @subpackage data
- * @category   Community Framework
- */
-interface IPositionAction {
-       /**
-        * Updates the positions of the relevant objects.
-        */
-       public function updatePosition();
-       
-       /**
-        * Validates the "updatePosition" action.
-        */
-       public function validateUpdatePosition();
-}

diff --git a/wcfsetup/install/files/lib/data/ISortableAction.class.php b/wcfsetup/install/files/lib/data/ISortableAction.class.php
index 86decc8be2f4520122b58d20def694b4d21cd904..fcf8179e9a1710c2abcf1774999623261bc11642 100644 (file)
--- a/wcfsetup/install/files/lib/data/ISortableAction.class.php
+++ b/wcfsetup/install/files/lib/data/ISortableAction.class.php
@@ -2,9 +2,10 @@
 namespace wcf\data;
 
 /**
- * Default interface for sortable database objects.
+ * Every object action whose objects can be sorted via AJAX has to implement this
+ * interface.
  * 
- * @author     Alexander Ebert
+ * @author     Alexander Ebert, Matthias Schmidt
  * @copyright  2001-2012 WoltLab GmbH
  * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package    com.woltlab.wcf

diff --git a/wcfsetup/install/files/lib/data/category/CategoryAction.class.php b/wcfsetup/install/files/lib/data/category/CategoryAction.class.php
index 752b33a746c573c8b1795be9dc833d4127da262e..59c90553553c44ce3944123380c5ae743d19473d 100644 (file)
--- a/wcfsetup/install/files/lib/data/category/CategoryAction.class.php
+++ b/wcfsetup/install/files/lib/data/category/CategoryAction.class.php
@@ -2,7 +2,7 @@
 namespace wcf\data\category;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\data\ICollapsibleContainerAction;
-use wcf\data\IPositionAction;
+use wcf\data\ISortableAction;
 use wcf\data\IToggleAction;
 use wcf\system\category\CategoryHandler;
 use wcf\system\exception\PermissionDeniedException;
@@ -21,7 +21,7 @@ use wcf\system\WCF;
  * @subpackage data.category
  * @category   Community Framework
  */
-class CategoryAction extends AbstractDatabaseObjectAction implements ICollapsibleContainerAction, IPositionAction, IToggleAction {
+class CategoryAction extends AbstractDatabaseObjectAction implements ICollapsibleContainerAction, ISortableAction, IToggleAction {
        /**
         * categorized object type
         * @var wcf\data\object\type\ObjectType
@@ -75,7 +75,7 @@ class CategoryAction extends AbstractDatabaseObjectAction implements ICollapsibl
        }
        
        /**
-        * @see wcf\data\IPositionAction::updatePosition()
+        * @see wcf\data\ISortableAction::updatePosition()
         */
        public function updatePosition() {
                $showOrders = array();
@@ -188,7 +188,7 @@ class CategoryAction extends AbstractDatabaseObjectAction implements ICollapsibl
        }
        
        /**
-        * @see wcf\data\IPositionAction::validateUpdatePosition()
+        * @see wcf\data\ISortableAction::validateUpdatePosition()
         */
        public function validateUpdatePosition() {
                // validate permissions