[stable22] Extend pending shares list in frontend to include remote shares #28209
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![backportbot-nextcloud[bot]](https://avatars.githubusercontent.com/in/21012?s=60&v=4){kind=small}
backportbot-nextcloud
bot
requested review from
artonge,
blizzz,
CarlSchwan,
icewind1991,
juliusknorr,
PVince81 and
skjnldsv
PVince81
force-pushed
the
backport/27751/stable22
branch
from
8471c92 to
091881e
Compare
|
conflict solved, but I need to retest many things and it's currently not working. likely the routing thing |
PVince81
force-pushed
the
backport/27751/stable22
branch
from
091881e to
9636ac9
Compare
|
fixed |
|
@artonge @juliushaertl please review. please note that I had to resolve conflicts and did a quick retest.
|
|
/rebase |
nextcloud-command
force-pushed
the
backport/27751/stable22
branch
from
3600526 to
29a958a
Compare
|
/compile amend / |
PVince81
force-pushed
the
backport/27751/stable22
branch
from
29a958a to
c08d28e
Compare
|
I did this manually, seems there was some kind of clash |
|
|
skjnldsv
approved these changes
Jul 29, 2021
PVince81
added
4. to release
|
Needs another rebase 🙈 |
And adjust the accept/decline actions to use the right endpoint for remote shares. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Fix pending shares endpoint to consider user-specific sub-entries for group shares whenever a share was accepted or declined. Added unit test for adding remote group shares. Fixed "removeUserShares" to not send a remote request as we never send remote requests for group shares. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
In the list of pending shares, the option for rejecting the share has been removed. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Instead of just returning false, also log the exception to make debugging database issues easier. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
When accepting a group share, a sub-share entry is created which also has a different id. When accepting or rejecting the sub-share, simply update the "accepted" flag instead of trying to re-insert the entry. Adjust getShare to also properly validate group share membership when called on a sub-share id. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Only remove reject share for remote group shares Also fix share indicator to appear for remote group shares as well. Fix pending remote share icon to be the one of a share. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Accepting and declining can now be done repeatedly on both the parent group share and sub-share with the same effects. Added unit tests to cover these cases, and also when the same operation is repeated. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Use query builder with proper matching for finding the group names. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
When declining a remote group share through the dialog that appears when notifications are off, the mount point is now correctly saved when re-accepting. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Signed-off-by: Vincent Petry <vincent@nextcloud.com> Co-authored-by: Carl Schwan <carl@carlschwan.eu>
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
When deleting a user, we should only delete the direct remote user shares or the remote group based subshares. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
PVince81
force-pushed
the
backport/27751/stable22
branch
from
c08d28e to
f60ea8a
Compare
|
pumped up the (re)base |
MichaIng
approved these changes
Aug 15, 2021
skjnldsv
approved these changes
Aug 19, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport of #27751