mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 13:25:52 +03:00
This disables the workaround 487e1fdca5ee04fc98c1ed77898df70d740967c8 for servers that are new enough to support fine grained permissions on federated shares. The consequence is that the 'reshare' permission is now granted by default and that users can edit permissions on the usual fine-grained level again. The way the client deals with servers <9.1 is unchanged.
This commit is contained in:
parent
001075daf0
commit
bdb304f8ec
1 changed files with 8 additions and 4 deletions
|
@ -248,10 +248,12 @@ void ShareUserGroupWidget::slotCompleterActivated(const QModelIndex & index)
|
|||
layout->addWidget(indicator);
|
||||
|
||||
/*
|
||||
* Don't send the reshare permissions for federataed shares
|
||||
* Don't send the reshare permissions for federated shares for servers <9.1
|
||||
* https://github.com/owncloud/core/issues/22122#issuecomment-185637344
|
||||
* https://github.com/owncloud/client/issues/4996
|
||||
*/
|
||||
if (sharee->type() == Sharee::Federated) {
|
||||
if (sharee->type() == Sharee::Federated
|
||||
&& _account->serverVersionInt() < 0x090100) {
|
||||
int permissions = SharePermissionRead | SharePermissionUpdate;
|
||||
if (!_isFile) {
|
||||
permissions |= SharePermissionCreate | SharePermissionDelete;
|
||||
|
@ -335,10 +337,12 @@ ShareWidget::ShareWidget(QSharedPointer<Share> share,
|
|||
connect(_ui->permissionsEdit, SIGNAL(clicked(bool)), SLOT(slotEditPermissionsChanged()));
|
||||
|
||||
/*
|
||||
* We don't show permssion share for federated shares
|
||||
* We don't show permssion share for federated shares with server <9.1
|
||||
* https://github.com/owncloud/core/issues/22122#issuecomment-185637344
|
||||
* https://github.com/owncloud/client/issues/4996
|
||||
*/
|
||||
if (share->getShareType() == Share::TypeRemote) {
|
||||
if (share->getShareType() == Share::TypeRemote
|
||||
&& share->account()->serverVersionInt() < 0x090100) {
|
||||
_ui->permissionShare->setVisible(false);
|
||||
_ui->permissionToolButton->setVisible(false);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue