More checks to avoid errors on forgetting room

This commit is contained in:
miruka 2019-07-07 22:49:28 -04:00
parent 2170b16175
commit d26f087df9
3 changed files with 2 additions and 4 deletions

View File

@ -1,5 +1,3 @@
- room doesn't change category when accept/reject invite
- "rejoin" leftbanner button if room is public - "rejoin" leftbanner button if room is public
- daybreak color - daybreak color
- html links color - html links color

View File

@ -13,7 +13,7 @@ Banner {
avatar.userId: inviterId avatar.userId: inviterId
labelText: qsTr("%1 invited you to join the room.").arg( labelText: qsTr("%1 invited you to join the room.").arg(
inviterId ? inviterId && inviterInfo ?
Utils.coloredNameHtml(inviterInfo.displayName, inviterId) : Utils.coloredNameHtml(inviterInfo.displayName, inviterId) :
qsTr("Someone") qsTr("Someone")
) )

View File

@ -9,7 +9,7 @@ Banner {
// TODO: avatar func auto // TODO: avatar func auto
avatar.userId: userId avatar.userId: userId
avatar.imageUrl: users.find(userId).avatarUrl avatar.imageUrl: userInfo ? userInfo.avatarUrl : null
labelText: qsTr("You are not part of this room anymore.") labelText: qsTr("You are not part of this room anymore.")
buttonModel: [ buttonModel: [