Skip to content

Show share settings only if incoming federated shares are allowed - #15830

Merged
skjnldsv merged 1 commit into
masterfrom
bugfix/15802/do-not-show-share-settings
Jun 11, 2019
Merged

Show share settings only if incoming federated shares are allowed#15830
skjnldsv merged 1 commit into
masterfrom
bugfix/15802/do-not-show-share-settings

Conversation

@MorrisJobke

Copy link
Copy Markdown
Member

Fixes#15802

Followup to #15638 which implemented like it was before, but that had a logical bug in it to only show the ID when outgoing federated shares where allowed, but it makes only sense to show the federated ID for incoming federated shares.

And it removes unneeded code.

Fixes#15802
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke

Copy link
Copy Markdown
MemberAuthor

/backport to stable16

@MorrisJobke

Copy link
Copy Markdown
MemberAuthor

/backport to stable15

@schiessleschiessle 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.

tested and works as expected! 👍

@juliusknorrjuliusknorr added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 5, 2019
@skjnldsv
skjnldsv merged commit dc600f2 into masterJun 11, 2019
@skjnldsv
skjnldsv deleted the bugfix/15802/do-not-show-share-settings branch June 11, 2019 16:31
@backportbot-nextcloud

Copy link
Copy Markdown

backport to stable16 in #15926

@backportbot-nextcloud

Copy link
Copy Markdown

The backport to stable15 failed. Please do this backport manually.

@skjnldsv

Copy link
Copy Markdown
Member

15 backport #15927

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

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

personal sharing settings empty

5 participants

@MorrisJobke@skjnldsv@ChristophWurst@schiessle@juliusknorr