Skip to content

[Stable 10] Group shares with same source and target - #713

Merged
schiessle merged 11 commits into
stable10from
stable10_474
Aug 8, 2016
Merged

[Stable 10] Group shares with same source and target #713
schiessle merged 11 commits into
stable10from
stable10_474

Conversation

@rullzer

@rullzerrullzer commented Aug 3, 2016

Copy link
Copy Markdown
Member

Backport of #474

Lets see if CI is happy.

CC: @LukasReschke@nickvergessen@MorrisJobke@schiessle

@rullzerrullzer added the 3. to review Waiting for reviews label Aug 3, 2016
@rullzerrullzer added this to the Nextcloud 10.0 milestone Aug 3, 2016
@mention-bot

Copy link
Copy Markdown

@rullzer, thanks for your PR! By analyzing the annotation information on this pull request, we identified @PVince81, @SergioBertolinSG and @icewind1991 to be potential reviewers

@MorrisJobke

Copy link
Copy Markdown
Member

Nope:


--- Failed scenarios:
/drone/src/github.com/nextcloud/server/build/integration/features/sharing-v1.feature:763
/drone/src/github.com/nextcloud/server/build/integration/features/sharing-v1.feature:907

@rullzer

Copy link
Copy Markdown
MemberAuthor

@MorrisJobke fix it!

@rullzerrullzer added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Aug 4, 2016
rullzerand others added 10 commits August 4, 2016 19:49
Fixes#24575
Note that this is a very limited solution and eventually we want smarter
merging!
The repair step was a bit overeager to skip repairing so it missed the
case where a group share exists without subshares but with an
additional direct user share.
In some situations, a group share is created before a user share, and
the recipient renamed the received share before the latter is created.
In this situation, the "file_target" was already modified and the second
created share must align to the already renamed share.
To achieve this, the MountProvider now groups only by "item_source"
value and sorts by share time. This makes it so that the least recent
share is selected as super-share and its "file_target" value is then
adjusted in all grouped shares.
This fixes the issue where this situation would have different
"file_target" values resulting in two shared folders appearing instead
of one.
@MorrisJobkeMorrisJobke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Aug 5, 2016
@MorrisJobke

Copy link
Copy Markdown
Member

👍

@schiessle

Copy link
Copy Markdown
Member

👍

@schiessle
schiessle merged commit 7321baa into stable10Aug 8, 2016
@schiessle
schiessle deleted the stable10_474 branch August 8, 2016 08:55
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@rullzer@mention-bot@MorrisJobke@schiessle