AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added an empty string check for the server name and user name change fields

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-12-12 17:15:10 +03:00
parent 6fd1ea26ee
commit ed6351f8f1
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/ui/qml/Pages2/PageSettingsServerInfo.qml
View file

@ -102,6 +102,7 @@ PageType {
headerText: qsTr("Server name") headerText: qsTr("Server name")
textFieldText: name textFieldText: name
textField.maximumLength: 30 textField.maximumLength: 30
checkEmptyText: true
} }
BasicButtonType { BasicButtonType {
@ -110,10 +111,14 @@ PageType {
text: qsTr("Save") text: qsTr("Save")
onClicked: { onClicked: {
if (serverName.textFieldText === "") {
return
}
if (serverName.textFieldText !== name) { if (serverName.textFieldText !== name) {
name = serverName.textFieldText name = serverName.textFieldText
serverNameEditDrawer.visible = false
} }
serverNameEditDrawer.visible = false
} }
} }
} }

14
client/ui/qml/Pages2/PageShare.qml
View file

@ -260,6 +260,7 @@ PageType {
headerText: qsTr("User name") headerText: qsTr("User name")
textFieldText: "New client" textFieldText: "New client"
textField.maximumLength: 20
checkEmptyText: true checkEmptyText: true
} }
@ -470,7 +471,9 @@ PageType {
imageSource: "qrc:/images/controls/share-2.svg" imageSource: "qrc:/images/controls/share-2.svg"
onClicked: { onClicked: {
ExportController.generateConfig(root.connectionTypesModel[exportTypeSelector.currentIndex].type) if (clientNameTextField.textFieldText !== "") {
ExportController.generateConfig(root.connectionTypesModel[exportTypeSelector.currentIndex].type)
}
} }
} }
@ -624,7 +627,8 @@ PageType {
Layout.fillWidth: true Layout.fillWidth: true
headerText: qsTr("Client name") headerText: qsTr("Client name")
textFieldText: clientName textFieldText: clientName
textField.maximumLength: 30 textField.maximumLength: 20
checkEmptyText: true
} }
BasicButtonType { BasicButtonType {
@ -633,6 +637,10 @@ PageType {
text: qsTr("Save") text: qsTr("Save")
onClicked: { onClicked: {
if (clientNameEditor.textFieldText === "") {
return
}
if (clientNameEditor.textFieldText !== clientName) { if (clientNameEditor.textFieldText !== clientName) {
PageController.showBusyIndicator(true) PageController.showBusyIndicator(true)
ExportController.renameClient(index, ExportController.renameClient(index,
@ -661,7 +669,7 @@ PageType {
text: qsTr("Revoke") text: qsTr("Revoke")
onClicked: function() { onClicked: function() {
questionDrawer.headerText = qsTr("Revoke the config for a user - ") + clientName + "?" questionDrawer.headerText = qsTr("Revoke the config for a user - %1?").arg(clientName)
questionDrawer.descriptionText = qsTr("The user will no longer be able to connect to your server.") questionDrawer.descriptionText = qsTr("The user will no longer be able to connect to your server.")
questionDrawer.yesButtonText = qsTr("Continue") questionDrawer.yesButtonText = qsTr("Continue")
questionDrawer.noButtonText = qsTr("Cancel") questionDrawer.noButtonText = qsTr("Cancel")