From 30a533d49c160573162fd44d8592ae357d7047c3 Mon Sep 17 00:00:00 2001 From: Camila Date: Wed, 8 Jul 2020 19:53:45 +0200 Subject: [PATCH] Share link display the correct permissions for files and folders. - Fix #2175: - Shows the correct default permissions - Shows the permissions the user set Signed-off-by: Camila --- src/gui/sharelinkwidget.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp index 12f2e7027..1f832bb4c 100644 --- a/src/gui/sharelinkwidget.cpp +++ b/src/gui/sharelinkwidget.cpp @@ -154,23 +154,24 @@ void ShareLinkWidget::setupUiOptions() permissionsGroup->setExclusive(true); if (_isFile) { - checked = perm & (SharePermissionRead & SharePermissionUpdate); + checked = (perm & SharePermissionRead) && (perm & SharePermissionUpdate); _allowEditingLinkAction = _linkContextMenu->addAction(tr("Allow Editing")); _allowEditingLinkAction->setCheckable(true); _allowEditingLinkAction->setChecked(checked); } else { - checked = perm & SharePermissionRead; + checked = (perm == SharePermissionRead); _readOnlyLinkAction = permissionsGroup->addAction(tr("Read only")); _readOnlyLinkAction->setCheckable(true); _readOnlyLinkAction->setChecked(checked); - checked = perm & (SharePermissionRead & SharePermissionCreate & SharePermissionUpdate & SharePermissionDelete); + checked = (perm & SharePermissionRead) && (perm & SharePermissionCreate) + && (perm & SharePermissionUpdate) && (perm & SharePermissionDelete); _allowUploadEditingLinkAction = permissionsGroup->addAction(tr("Allow Upload && Editing")); _allowUploadEditingLinkAction->setCheckable(true); _allowUploadEditingLinkAction->setChecked(checked); - checked = perm & SharePermissionCreate; + checked = (perm == SharePermissionCreate); _allowUploadLinkAction = permissionsGroup->addAction(tr("File Drop (Upload Only)")); _allowUploadLinkAction->setCheckable(true); _allowUploadLinkAction->setChecked(checked); @@ -564,11 +565,11 @@ void ShareLinkWidget::customizeStyle() _addAnotherLinkAction->setIcon(Theme::createColorAwareIcon(":/client/theme/add.svg")); _ui->enableShareLink->setIcon(Theme::createColorAwareIcon(":/client/theme/copy.svg")); - + _ui->shareLinkIconLabel->setPixmap(Theme::createColorAwarePixmap(":/client/theme/public.svg")); - + _ui->shareLinkToolButton->setIcon(Theme::createColorAwareIcon(":/client/theme/more.svg")); - + _ui->confirmNote->setIcon(Theme::createColorAwareIcon(":/client/theme/confirm.svg")); _ui->confirmPassword->setIcon(Theme::createColorAwareIcon(":/client/theme/confirm.svg")); _ui->confirmExpirationDate->setIcon(Theme::createColorAwareIcon(":/client/theme/confirm.svg")); -- 2.30.2