Skip to content

Commit 0d0d7f0

Browse files
authored
Merge pull request #219 from WoltLab/6.2-conversation-list-redesign
Redesign of the conversation list
2 parents d8cbe75 + 232ef0e commit 0d0d7f0

55 files changed

Lines changed: 1231 additions & 945 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

files/acp/database/install_com.woltlab.wcf.conversation.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

33
/**
4-
* @author Tim Duesterhus
5-
* @copyright 2001-2021 WoltLab GmbH
6-
* @license WoltLab License <http://www.woltlab.com/license-agreement.html>
4+
* @author Tim Duesterhus
5+
* @copyright 2001-2025 WoltLab GmbH
6+
* @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
77
*/
88

99
use wcf\system\database\table\column\DefaultFalseBooleanDatabaseTableColumn;
@@ -15,7 +15,6 @@
1515
use wcf\system\database\table\column\NotNullVarchar255DatabaseTableColumn;
1616
use wcf\system\database\table\column\ObjectIdDatabaseTableColumn;
1717
use wcf\system\database\table\column\SmallintDatabaseTableColumn;
18-
use wcf\system\database\table\column\TextDatabaseTableColumn;
1918
use wcf\system\database\table\column\TinyintDatabaseTableColumn;
2019
use wcf\system\database\table\column\VarcharDatabaseTableColumn;
2120
use wcf\system\database\table\DatabaseTable;
@@ -57,7 +56,6 @@
5756
MediumintDatabaseTableColumn::create('participants')
5857
->notNull()
5958
->defaultValue(0),
60-
TextDatabaseTableColumn::create('participantSummary'),
6159
DefaultFalseBooleanDatabaseTableColumn::create('participantCanInvite'),
6260
DefaultFalseBooleanDatabaseTableColumn::create('isClosed'),
6361
DefaultFalseBooleanDatabaseTableColumn::create('isDraft'),
@@ -83,6 +81,7 @@
8381
]),
8482
DatabaseTable::create('wcf1_conversation_to_user')
8583
->columns([
84+
ObjectIdDatabaseTableColumn::create('conversationParticipantID'),
8685
NotNullInt10DatabaseTableColumn::create('conversationID'),
8786
IntDatabaseTableColumn::create('participantID')
8887
->length(10),
@@ -104,6 +103,8 @@
104103
DefaultTrueBooleanDatabaseTableColumn::create('leftByOwnChoice'),
105104
])
106105
->indices([
106+
DatabaseTablePrimaryIndex::create()
107+
->columns(['conversationID']),
107108
DatabaseTableIndex::create('participantID')
108109
->columns(['participantID', 'conversationID'])
109110
->type(DatabaseTableIndex::UNIQUE_TYPE),
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?php
2+
3+
/**
4+
* @author Marcel Werk
5+
* @copyright 2001-2025 WoltLab GmbH
6+
* @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
7+
*/
8+
9+
use wcf\system\database\table\column\ObjectIdDatabaseTableColumn;
10+
use wcf\system\database\table\column\TextDatabaseTableColumn;
11+
use wcf\system\database\table\index\DatabaseTablePrimaryIndex;
12+
use wcf\system\database\table\PartialDatabaseTable;
13+
14+
return [
15+
PartialDatabaseTable::create('wcf1_conversation')
16+
->columns([
17+
TextDatabaseTableColumn::create('participantSummary')->drop(),
18+
]),
19+
PartialDatabaseTable::create('wcf1_conversation_to_user')
20+
->columns([
21+
ObjectIdDatabaseTableColumn::create('conversationParticipantID'),
22+
])
23+
->indices([
24+
DatabaseTablePrimaryIndex::create()
25+
->columns(['conversationParticipantID']),
26+
]),
27+
];

files/js/WoltLabSuite/Core/Conversation/Ui/MarkAllAsRead.js renamed to files/js/WoltLabSuite/Core/Conversation/Component/MarkAllAsRead.js

Lines changed: 9 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

files/js/WoltLabSuite/Core/Conversation/Component/MarkAsRead.js

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

files/js/WoltLabSuite/Core/Conversation/Ui/MarkAsRead.js

Lines changed: 0 additions & 35 deletions
This file was deleted.

files/js/WoltLabSuite/Core/Conversation/Ui/Message/InlineEditor.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)