openrat-cms

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit d9bc673781f1903b046dc8119f586552482e61bf
parent 68af186a1500f72c54d7651ae99a4636eff39cc2
Author: Jan Dankert <devnull@localhost>
Date:   Thu, 10 Jan 2019 22:30:06 +0100

Cleanup: Methode 'reorder' kann weg.

Diffstat:
modules/cms-core/action/FolderAction.class.php | 48+-----------------------------------------------
modules/cms-core/model/BaseObject.class.php | 10++++------
2 files changed, 5 insertions(+), 53 deletions(-)

diff --git a/modules/cms-core/action/FolderAction.class.php b/modules/cms-core/action/FolderAction.class.php @@ -412,7 +412,7 @@ class FolderAction extends ObjectAction foreach( $order as $objectid ) { - if ( ! in_array($objectid,$ids) ) + if ( ! is_numeric($objectid) || ! in_array($objectid,$ids) ) { throw new \LogicException('Object-Id '.$objectid.' is not in this folder any more'); } @@ -818,52 +818,6 @@ class FolderAction extends ObjectAction } - /** - * Reihenfolge von Objekten aendern. - */ - public function reorderPost() - { - $type = $this->getRequestVar('type'); - - switch( $type ) - { - case 'type': - $ids = $this->folder->getObjectIdsByType(); - break; - - case 'name': - $ids = $this->folder->getChildObjectIdsByName(); - break; - - case 'lastchange': - $ids = $this->folder->getObjectIdsByLastChange(); - break; - - case 'flip': - $ids = $this->folder->getObjectIds(); - $ids = array_reverse( $ids ); // Reihenfolge drehen - - break; - - default: - throw new \InvalidArgumentException('Unknown reordertype: '.$type ); - } - - // Und jetzt die neu ermittelte Reihenfolge speichern - $seq = 0; - foreach( $ids as $id ) - { - $seq++; // Sequenz um 1 erhoehen - - $o = new BaseObject( $id ); - $o->setOrderId( $seq ); - - unset( $o ); - } - $this->addNotice($this->folder->getType(),$this->folder->name,'SEQUENCE_CHANGED','ok'); - - $this->folder->setTimestamp(); - } public function settopPost() diff --git a/modules/cms-core/model/BaseObject.class.php b/modules/cms-core/model/BaseObject.class.php @@ -1079,11 +1079,9 @@ SQL * * @param Integer neue Sequenz-Nr. */ - function setOrderId( $orderid ) + public function setOrderId( $orderid ) { - $db = db_connection(); - - $sql = $db->sql('UPDATE {{object}} '.' SET orderid={orderid}'.' WHERE id={objectid}'); + $sql = db()->sql('UPDATE {{object}} '.' SET orderid={orderid}'.' WHERE id={objectid}'); $sql->setInt('objectid', $this->objectid); $sql->setInt('orderid', $orderid); @@ -1097,7 +1095,7 @@ SQL * * @param Integer ?bergeordnete Objekt-ID */ - function setParentId( $parentid ) + public function setParentId( $parentid ) { $db = db_connection(); @@ -1109,7 +1107,7 @@ SQL } - function getDependentObjectIds() + public function getDependentObjectIds() { $db = db_connection();