butter/keanu-weblite
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'disappearing-messages-permission' into 'dev'

Browse source 
Make sure only admins can change retention

See merge request keanuapp/keanuapp-weblite!280
This commit is contained in:
N Pex 2024-02-06 10:31:31 +00:00
commit a07853a1e8
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/RoomInfo.vue
View file

@ -138,7 +138,7 @@
</v-card-text> </v-card-text>
</v-card> </v-card>
<v-card class="account ma-3" flat v-if="(iAmAdmin() && availableRoomTypes.length > 1) || canChangeReadOnly()"> <v-card class="account ma-3" flat v-if="(iAmAdmin() && availableRoomTypes.length > 1) || canChangeReadOnly() || canViewRetentionPolicy">
<v-card-title class="h2 with-right-label"><div>{{ $t("room_info.experimental_features") }}</div><div></div></v-card-title> <v-card-title class="h2 with-right-label"><div>{{ $t("room_info.experimental_features") }}</div><div></div></v-card-title>
<v-card-text v-if="iAmAdmin() && availableRoomTypes.length > 1"> <v-card-text v-if="iAmAdmin() && availableRoomTypes.length > 1">
<div class="d-flex flex-wrap"> <div class="d-flex flex-wrap">

2
src/components/roomInfoMixin.js
View file

@ -111,7 +111,7 @@ export default {
* Return true if we can set message retention policy in the room. * Return true if we can set message retention policy in the room.
*/ */
canChangeRetentionPolicy() { canChangeRetentionPolicy() {
return true; return this.userCanExportChat;
}, },
}, },
watch: { watch: {