status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(Communities): make creating channels work again 

There was a breaking change introduced 8d32c1d933
which caused reference errors in various modals.

This commit fixes the modal to create and edit community channels
by ensuring we're accessing `contentItem` and also only setting
channel data when editing a channel.

Closes #3390
This commit is contained in:
Pascal Precht 2021-09-07 15:23:07 +02:00 committed by RichΛrd
parent 5a448abfd5
commit 942965f13b
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ui/app/AppLayouts/Chat/CommunityComponents/CreateChannelPopup.qml
View File

@ -26,23 +26,23 @@ StatusModal {
header.title: qsTrId("create-channel-title")
onOpened: {
contentComponent.channelId = channel.id
contentComponent.channelCategoryId = channel.categoryId
contentComponent.channelName.input.text = ""
contentItem.channelName.input.text = ""
contentItem.channelName.input.forceActiveFocus(Qt.MouseFocusReason)
if (isEdit) {
//% "Edit #%1"
header.title = qsTrId("edit---1").arg(channel.name);
contentComponent.channelName.input.text = channel.name
contentItem.channelId = channel.id
contentItem.channelCategoryId = channel.categoryId
contentItem.channelName.input.text = channel.name
contentItem.channelDescription.input.text = channel.description
}
contentComponent.channelName.input.forceActiveFocus(Qt.MouseFocusReason)
contentComponent.channelDescription.input.text = channel.description
}
onClosed: destroy()
function isFormValid() {
return contentComponent.channelName.valid &&
contentComponent.channelDescription.valid
return contentItem.channelName.valid &&
contentItem.channelDescription.valid
}
contentItem: ScrollView {
@ -154,6 +154,11 @@ StatusModal {
/* text: qsTrId("limit-channel-members-to-sending-one-message-per-chose-time-interval") */
/* } */
Item {
width: parent.width
height: 8
}
StatusListItem {
anchors.horizontalCenter: parent.horizontalCenter
//% "Pinned messages"
@ -171,8 +176,9 @@ StatusModal {
sensor.onClicked: openPopup(pinnedMessagesPopupComponent)
}
StatusModalDivider {
topPadding: 8
Item {
width: parent.width
height: 8
}
}
}
@ -193,18 +199,18 @@ StatusModal {
let error = "";
if (!isEdit) {
error = chatsModel.createCommunityChannel(communityId,
Utils.filterXSS(popup.contentComponent.channelName.input.text),
Utils.filterXSS(popup.contentComponent.channelDescription.input.text),
Utils.filterXSS(popup.contentItem.channelName.input.text),
Utils.filterXSS(popup.contentItem.channelDescription.input.text),
categoryId)
// TODO: pass the private value when private channels
// are implemented
//privateSwitch.checked)
} else {
error = chatsModel.editCommunityChannel(communityId,
popup.contentComponent.channelId,
Utils.filterXSS(popup.contentComponent.channelName.input.text),
Utils.filterXSS(popup.contentComponent.channelDescription.input.text),
popup.contentComponent.channelCategoryId)
popup.contentItem.channelId,
Utils.filterXSS(popup.contentItem.channelName.input.text),
Utils.filterXSS(popup.contentItem.channelDescription.input.text),
popup.contentItem.channelCategoryId)
// TODO: pass the private value when private channels
// are implemented
//privateSwitch.checked)