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

Merge pull request #2168 from nextcloud/display-default-permissions-share

Browse source 
Display the correct default permissions when creating a share.
This commit is contained in:
Michael Schuster 2020-07-09 05:19:56 +02:00 committed by GitHub
commit 4fec77e9c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/ocssharejob.cpp
View file

@ -149,9 +149,6 @@ void OcsShareJob::createShare(const QString &path,
addParam(QString::fromLatin1("path"), path);
addParam(QString::fromLatin1("shareType"), QString::number(shareType));
addParam(QString::fromLatin1("shareWith"), shareWith);
if (!(permissions & SharePermissionDefault)) {
addParam(QString::fromLatin1("permissions"), QString::number(permissions));
}
start();
}

2
src/gui/sharepermissions.h
View file

@ -28,7 +28,7 @@ enum SharePermission {
SharePermissionCreate = 4,
SharePermissionDelete = 8,
SharePermissionShare = 16,
SharePermissionDefault = 1 << 30
SharePermissionDefault = 31
};
Q_DECLARE_FLAGS(SharePermissions, SharePermission)
Q_DECLARE_OPERATORS_FOR_FLAGS(SharePermissions)

5
src/gui/shareusergroupwidget.cpp
View file

@ -208,7 +208,7 @@ void ShareUserGroupWidget::slotSharesFetched(const QList<QSharedPointer<Share>>
}
// the owner of the file that shared it first
// leave out if it's the current user
// leave out if it's the current user
if(x == 0 && !share->getUidOwner().isEmpty() && !(share->getUidOwner() == _account->credentials()->user())) {
_ui->mainOwnerLabel->setText(QString("Shared with you by ").append(share->getOwnerDisplayName()));
}
@ -320,7 +320,8 @@ void ShareUserGroupWidget::slotCompleterActivated(const QModelIndex &index)
} else {
// Default permissions on creation
int permissions = SharePermissionRead | SharePermissionUpdate;
int permissions = SharePermissionCreate | SharePermissionUpdate
| SharePermissionDelete | SharePermissionShare;
_manager->createShare(_sharePath, Share::ShareType(sharee->type()),
sharee->shareWith(), SharePermission(permissions));
}