mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 05:25:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5948 from nextcloud/bugfix/share-password-entry-display

Browse source 
Hide password field in share settings when share type does not support passwords
This commit is contained in:
Matthieu Gallien 2023-08-22 11:00:24 +02:00 committed by GitHub
commit e83c2c86e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gui/filedetails/ShareDetailsPage.qml
View file

@ -80,6 +80,8 @@ Page {
readonly property int currentPermissionMode: shareModelData.currentPermissionMode
readonly property bool isLinkShare: shareModelData.shareType === ShareModel.ShareTypeLink
readonly property bool isEmailShare: shareModelData.shareType === ShareModel.ShareTypeEmail
readonly property bool shareSupportsPassword: isLinkShare || isEmailShare
readonly property bool isFolderItem: shareModelData.sharedItemType === ShareModel.SharedItemTypeFolder
readonly property bool isEncryptedItem: shareModelData.sharedItemType === ShareModel.SharedItemTypeEncryptedFile || shareModelData.sharedItemType === ShareModel.SharedItemTypeEncryptedFolder || shareModelData.sharedItemType === ShareModel.SharedItemTypeEncryptedTopLevelFolder
@ -560,7 +562,10 @@ Page {
checkable: true
checked: root.passwordProtectEnabled
text: qsTr("Password protect")
enabled: !root.waitingForPasswordProtectEnabledChange && !root.passwordEnforced
visible: root.shareSupportsPassword
enabled: visible &&
!root.waitingForPasswordProtectEnabledChange &&
!root.passwordEnforced
onClicked: {
root.togglePasswordProtect(checked);
@ -581,7 +586,7 @@ Page {
height: visible ? implicitHeight : 0
spacing: scrollContentsColumn.indicatorSpacing
visible: root.passwordProtectEnabled
visible: root.shareSupportsPassword && root.passwordProtectEnabled
Image {
Layout.preferredWidth: scrollContentsColumn.indicatorItemWidth
@ -603,7 +608,8 @@ Page {
height: visible ? implicitHeight : 0
text: root.password !== "" ? root.password : root.passwordPlaceholder
enabled: root.passwordProtectEnabled &&
enabled: visible &&
root.passwordProtectEnabled &&
!root.waitingForPasswordChange &&
!root.waitingForPasswordProtectEnabledChange