diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2020-02-04 15:05:49 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2020-02-04 15:05:49 +0300 |
| commit | 38f3a524f9f24578744d2e2a0654b754a9ed90aa (patch) | |
| tree | f09fbe50799d7f621343c71f37a918c8894131cd /src/gui/sharelinkwidget.cpp | |
| parent | b887cd6755d2d43d4de7273dbad7406868addd09 (diff) | |
| parent | 120c696edbf48538516ea52aee8ad985fc3981a5 (diff) | |
Merge remote-tracking branch 'origin/2.6' into 7247-share-pw-require
Conflicts:
src/gui/sharelinkwidget.cpp
src/libsync/capabilities.cpp
Diffstat (limited to 'src/gui/sharelinkwidget.cpp')
| -rw-r--r-- | src/gui/sharelinkwidget.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp index 5aeb2e9a1..47bf2e7cf 100644 --- a/src/gui/sharelinkwidget.cpp +++ b/src/gui/sharelinkwidget.cpp @@ -147,12 +147,13 @@ ShareLinkWidget::ShareLinkWidget(AccountPtr account, _expiryRequired = true; } - // File can't have public upload set; we also hide it if the capability isn't there - _ui->widget_editing->setVisible( - !_isFile && _account->capabilities().sharePublicLinkAllowUpload()); - _ui->radio_uploadOnly->setVisible( - _account->capabilities().sharePublicLinkSupportsUploadOnly()); - + // Hide permissions that are unavailable for files or disabled by capability. + bool rwVisible = !_isFile && _account->capabilities().sharePublicLinkAllowUpload(); + bool uploadOnlyVisible = rwVisible && _account->capabilities().sharePublicLinkSupportsUploadOnly(); + _ui->radio_readWrite->setVisible(rwVisible); + _ui->label_readWrite->setVisible(rwVisible); + _ui->radio_uploadOnly->setVisible(uploadOnlyVisible); + _ui->label_uploadOnly->setVisible(uploadOnlyVisible); // Prepare sharing menu |