torsten/yourpart3
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Update room management in AdminController: Modify updateRoom and deleteRoom methods to include userId as a parameter for improved access control.

Browse Source
This commit is contained in:
Torsten Schulz (local)
2026-03-04 22:38:24 +01:00
parent 407c3b359b
commit db8be34607
3 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
backend/migrations/add_chat_room_dialog_fields.sql Normal file
View File

@@ -0,0 +1,19 @@
BEGIN;
ALTER TABLE chat.room
ADD COLUMN IF NOT EXISTS gender_restriction_id INTEGER,
ADD COLUMN IF NOT EXISTS min_age INTEGER,
ADD COLUMN IF NOT EXISTS max_age INTEGER,
ADD COLUMN IF NOT EXISTS password VARCHAR(255),
ADD COLUMN IF NOT EXISTS friends_of_owner_only BOOLEAN DEFAULT FALSE,
ADD COLUMN IF NOT EXISTS required_user_right_id INTEGER;
UPDATE chat.room
SET friends_of_owner_only = FALSE
WHERE friends_of_owner_only IS NULL;
ALTER TABLE chat.room
ALTER COLUMN friends_of_owner_only SET DEFAULT FALSE,
ALTER COLUMN friends_of_owner_only SET NOT NULL;
COMMIT;

10
frontend/src/views/admin/ChatRoomsView.vue
View File

@@ -15,7 +15,7 @@
<tbody> <tbody>
<tr v-for="room in rooms" :key="room.id"> <tr v-for="room in rooms" :key="room.id">
<td>{{ room.title }}</td> <td>{{ room.title }}</td>
<td>{{ room.roomTypeTr || room.roomTypeId }}</td> <td>{{ getRoomTypeLabel(room) }}</td>
<td>{{ room.isPublic ? $t('common.yes') : $t('common.no') }}</td> <td>{{ room.isPublic ? $t('common.yes') : $t('common.no') }}</td>
<td> <td>
<button @click="editRoom(room)">{{ $t('common.edit') }}</button> <button @click="editRoom(room)">{{ $t('common.edit') }}</button>
@@ -48,6 +48,14 @@ export default {
this.fetchRooms(); this.fetchRooms();
}, },
methods: { methods: {
getRoomTypeLabel(room) {
const roomTypeTr = room?.roomType?.tr || room?.roomTypeTr;
if (!roomTypeTr) {
return room?.roomTypeId ?? '-';
}
const translationKey = `admin.chatrooms.roomtype.${roomTypeTr}`;
return this.$te(translationKey) ? this.$t(translationKey) : roomTypeTr;
},
openCreateDialog() { openCreateDialog() {
this.selectedRoom = null; this.selectedRoom = null;
this.$refs.roomDialog.open(); this.$refs.roomDialog.open();

10
frontend/src/views/admin/RoomsView.vue
View File

@@ -14,7 +14,7 @@
<tbody> <tbody>
<tr v-for="room in rooms" :key="room.id"> <tr v-for="room in rooms" :key="room.id">
<td>{{ room.title }}</td> <td>{{ room.title }}</td>
<td>{{ room.roomTypeTr || room.roomTypeId }}</td> <td>{{ getRoomTypeLabel(room) }}</td>
<td>{{ room.isPublic ? $t('common.yes') : $t('common.no') }}</td> <td>{{ room.isPublic ? $t('common.yes') : $t('common.no') }}</td>
<td> <td>
<button @click="editRoom(room)">{{ $t('common.edit') }}</button> <button @click="editRoom(room)">{{ $t('common.edit') }}</button>
@@ -68,6 +68,14 @@ export default {
const res = await apiClient.get('/api/admin/chat/rooms'); const res = await apiClient.get('/api/admin/chat/rooms');
this.rooms = res.data; this.rooms = res.data;
}, },
getRoomTypeLabel(room) {
const roomTypeTr = room?.roomType?.tr || room?.roomTypeTr;
if (!roomTypeTr) {
return room?.roomTypeId ?? '-';
}
const translationKey = `admin.chatrooms.roomtype.${roomTypeTr}`;
return this.$te(translationKey) ? this.$t(translationKey) : roomTypeTr;
},
async saveRoom(roomData) { async saveRoom(roomData) {
// Remove forbidden and associated object fields before sending to backend // Remove forbidden and associated object fields before sending to backend
const { id, ownerId, passwordHash, roomType, genderRestriction, ...cleanData } = roomData; const { id, ownerId, passwordHash, roomType, genderRestriction, ...cleanData } = roomData;