Bastelstube/Tims-Chat
1
0
Fork 0
mirror of https://github.com/wbbaddons/Tims-Chat.git synced 2024-12-22 21:40:08 +00:00
Code Issues Releases Wiki Activity

Rename position to showOrder

Browse Source
This commit is contained in:
Tim Düsterhus 2013-05-24 00:08:33 +02:00
parent c001e1c728
commit d64f11b315
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
file/lib/acp/page/RoomListPage.class.php
View File

@ -38,7 +38,7 @@ public function readData() {
parent::readData(); parent::readData();
$this->objects = new \chat\data\room\RoomList(); $this->objects = new \chat\data\room\RoomList();
$this->objects->sqlOrderBy = 'position ASC'; $this->objects->sqlOrderBy = 'showOrder ASC';
$this->objects->readObjects(); $this->objects->readObjects();
} }

6
file/lib/data/room/RoomAction.class.php
View File

@ -41,14 +41,14 @@ public function create() {
$room = parent::create(); $room = parent::create();
WCF::getDB()->beginTransaction(); WCF::getDB()->beginTransaction();
$sql = "SELECT MAX(position) $sql = "SELECT MAX(showOrder)
FROM ".call_user_func(array($this->className, 'getDatabaseTableName'))." FROM ".call_user_func(array($this->className, 'getDatabaseTableName'))."
FOR UPDATE"; FOR UPDATE";
$stmt = WCF::getDB()->prepareStatement($sql); $stmt = WCF::getDB()->prepareStatement($sql);
$stmt->execute(); $stmt->execute();
$editor = new RoomEditor($room); $editor = new RoomEditor($room);
$editor->update(array('position' => ($stmt->fetchColumn() + 1))); $editor->update(array('showOrder' => ($stmt->fetchColumn() + 1)));
WCF::getDB()->commitTransaction(); WCF::getDB()->commitTransaction();
return $room; return $room;
@ -115,7 +115,7 @@ public function updatePosition() {
if ($room === null) continue; if ($room === null) continue;
$editor = new RoomEditor($room); $editor = new RoomEditor($room);
$editor->update(array('position' => $i++)); $editor->update(array('showOrder' => $i++));
} }
WCF::getDB()->commitTransaction(); WCF::getDB()->commitTransaction();
} }

6
file/lib/data/room/RoomEditor.class.php
View File

@ -29,7 +29,7 @@ public static function deleteAll(array $objectIDs = array()) {
} }
$sql = "SELECT $sql = "SELECT
position showOrder
FROM FROM
chat".WCF_N."_room chat".WCF_N."_room
WHERE WHERE
@ -40,9 +40,9 @@ public static function deleteAll(array $objectIDs = array()) {
$sql = "UPDATE $sql = "UPDATE
chat".WCF_N."_room chat".WCF_N."_room
SET SET
position = position - 1 showOrder = showOrder - 1
WHERE WHERE
position > ?"; showOrder > ?";
$update = WCF::getDB()->prepareStatement($sql); $update = WCF::getDB()->prepareStatement($sql);
foreach ($objectIDs as $objectID) { foreach ($objectIDs as $objectID) {

2
file/lib/system/cache/builder/RoomCacheBuilder.class.php vendored
View File

@ -17,7 +17,7 @@ class RoomCacheBuilder extends \wcf\system\cache\builder\AbstractCacheBuilder {
public function rebuild(array $parameters) { public function rebuild(array $parameters) {
// get all chat rooms // get all chat rooms
$roomList = new \chat\data\room\RoomList(); $roomList = new \chat\data\room\RoomList();
$roomList->sqlOrderBy = "room.position"; $roomList->sqlOrderBy = "room.showOrder";
$roomList->readObjects(); $roomList->readObjects();
return $roomList->getObjects(); return $roomList->getObjects();

12
install.sql
View File

@ -32,11 +32,11 @@ CREATE TABLE chat1_room (
roomID INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY, roomID INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY,
title VARCHAR(255) NOT NULL, title VARCHAR(255) NOT NULL,
topic VARCHAR(255) NOT NULL, topic VARCHAR(255) NOT NULL,
position INT(10) NOT NULL DEFAULT 0, showOrder INT(10) NOT NULL DEFAULT 0,
permanent TINYINT(1) NOT NULL DEFAULT 1, permanent TINYINT(1) NOT NULL DEFAULT 1,
owner INT(10) DEFAULT NULL, owner INT(10) DEFAULT NULL,
KEY positionKey (position), KEY showOrder (showOrder),
KEY owner (owner) KEY owner (owner)
); );
@ -63,7 +63,7 @@ ALTER TABLE chat1_room ADD FOREIGN KEY (owner) REFERENCES wcf1_user (userID) ON
ALTER TABLE chat1_suspension ADD FOREIGN KEY (userID) REFERENCES wcf1_user (userID) ON DELETE CASCADE; ALTER TABLE chat1_suspension ADD FOREIGN KEY (userID) REFERENCES wcf1_user (userID) ON DELETE CASCADE;
ALTER TABLE chat1_suspension ADD FOREIGN KEY (roomID) REFERENCES chat1_room (roomID) ON DELETE CASCADE; ALTER TABLE chat1_suspension ADD FOREIGN KEY (roomID) REFERENCES chat1_room (roomID) ON DELETE CASCADE;
INSERT INTO chat1_room (title, topic, position) VALUES ('chat.room.title1', 'chat.room.topic1', 1); INSERT INTO chat1_room (title, topic, showOrder) VALUES ('chat.room.title1', 'chat.room.topic1', 1);
INSERT INTO chat1_room (title, topic, position) VALUES ('Testroom 2', 'Topic of Testroom 2', 2); INSERT INTO chat1_room (title, topic, showOrder) VALUES ('Testroom 2', 'Topic of Testroom 2', 2);
INSERT INTO chat1_room (title, topic, position) VALUES ('Testroom with a very long', 'The topic of this room is rather loing as well!', 3); INSERT INTO chat1_room (title, topic, showOrder) VALUES ('Testroom with a very long', 'The topic of this room is rather loing as well!', 3);
INSERT INTO chat1_room (title, topic, position) VALUES ('Room w/o topic', '', 4); INSERT INTO chat1_room (title, topic, showOrder) VALUES ('Room w/o topic', '', 4);