Skip to content

expand 'path is already shared' error message - #23718

Merged
rullzer merged 1 commit into
masterfrom
already-shared-error-message
Mar 19, 2021
Merged

expand 'path is already shared' error message#23718
rullzer merged 1 commit into
masterfrom
already-shared-error-message

Conversation

@icewind1991

Copy link
Copy Markdown
Member

Signed-off-by: Robin Appelman robin@icewind.nl

@icewind1991icewind1991 added the 3. to review Waiting for reviews label Oct 27, 2020
@icewind1991icewind1991 added this to the Nextcloud 21 milestone Oct 27, 2020
Comment threadlib/private/Share20/Manager.php Outdated
@MorrisJobke

Copy link
Copy Markdown
Member

Also CI fails due to the changed message.

@icewind1991
icewind1991force-pushed the already-shared-error-message branch 2 times, most recently from a18de89 to b254385CompareOctober 29, 2020 12:22
@nextcloudnextcloud deleted a comment from faily-botBotOct 29, 2020
Comment threadlib/private/Share20/Manager.php Outdated
}

// Identical share already existst
// Identical share already exist

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Identical share already exist
// Identical share already exists

Comment threadtests/lib/Share20/ManagerTest.php Outdated
Comment threadtests/lib/Share20/ManagerTest.php Outdated
This was referenced Dec 14, 2020
@MorrisJobke

Copy link
Copy Markdown
Member

Conflicts with #25533

use OC\HintException;
use OCP\IL10N;

class AlreadyShared extends HintException {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me drop this commit, as it was already implemented in #25533

@MorrisJobke
MorrisJobkeforce-pushed the already-shared-error-message branch 2 times, most recently from 39f849a to 6213473CompareMarch 15, 2021 14:34
Signed-off-by: Robin Appelman <robin@icewind.nl>
@MorrisJobke
MorrisJobkeforce-pushed the already-shared-error-message branch from 6213473 to a550649CompareMarch 15, 2021 14:55

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I rebased it and used the changes from #25533 in here instead of reimplementing it 👍

@MorrisJobke

Copy link
Copy Markdown
Member

/backport to stable20

@MorrisJobke

Copy link
Copy Markdown
Member

/backport to stable21

@skjnldsv

Copy link
Copy Markdown
Member

Noooooooooo

@MorrisJobke

Copy link
Copy Markdown
Member

Noooooooooo

No? :D

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsenhancement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@icewind1991@MorrisJobke@skjnldsv@rullzer