mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-26 23:28:14 +03:00
Hide password field in share settings when share type does not support passwords
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
parent
658e9cd8d4
commit
8bda3fdce7
1 changed files with 9 additions and 3 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue