Skip to content

fix(files_sharing): Implement conditional federation placeholder - #54310

Merged
nfebe merged 2 commits into
masterfrom
fix/conditional-federation-placeholders
Aug 11, 2025
Merged

fix(files_sharing): Implement conditional federation placeholder#54310
nfebe merged 2 commits into
masterfrom
fix/conditional-federation-placeholders

Conversation

@nfebe

@nfebenfebe commented Aug 7, 2025

Copy link
Copy Markdown
Contributor

This commits addresses an annoyance where the share input placeholder would suggest sharing via federated cloud ID even if federation was disabled.

@nfebe
nfebe requested a review from a team as a code ownerAugust 7, 2025 05:20
@nfebe
nfebeforce-pushed the fix/conditional-federation-placeholders branch from be53ba4 to 0644472CompareAugust 7, 2025 05:45
@nfebe
nfebe requested a review from a team as a code ownerAugust 7, 2025 05:45
@github-project-automationgithub-project-automationBot moved this to 🏗️ In progress in 📁 Files teamAug 7, 2025
@szaimen
szaimen removed their request for review August 11, 2025 11:50
@szaimenszaimen added this to the Nextcloud 32 milestone Aug 11, 2025

@mgallienmgallien left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

tested and works fine

@nfebe
nfebeforce-pushed the fix/conditional-federation-placeholders branch from 0644472 to a5878c8CompareAugust 11, 2025 16:35
@nfebe

Copy link
Copy Markdown
ContributorAuthor

/compile

@nfebe

Copy link
Copy Markdown
ContributorAuthor

/backport to stable31

@nfebe

Copy link
Copy Markdown
ContributorAuthor

/backport to stable30

@nextcloud-command
nextcloud-command requested a review from a team as a code ownerAugust 11, 2025 16:40
@nfebe
nfebeforce-pushed the fix/conditional-federation-placeholders branch from 06fb629 to 5e2f125CompareAugust 11, 2025 17:03
@nfebe

Copy link
Copy Markdown
ContributorAuthor

/compile

@nfebe
nfebe enabled auto-merge August 11, 2025 17:03
@nfebenfebe changed the title fix(files_sharing): Implementation conditional federation placeholderfix(files_sharing): Implement conditional federation placeholderAug 11, 2025
This commits addresses an annoyance where the share input placeholder would
suggest sharing via federated cloud ID even if federation was disabled.
Signed-off-by: nfebe <fenn25.fn@gmail.com>
@nfebe
nfebeforce-pushed the fix/conditional-federation-placeholders branch from 8674e92 to e7f4de6CompareAugust 11, 2025 17:55
@nfebe

Copy link
Copy Markdown
ContributorAuthor

/compile

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@nfebe
nfebe merged commit 49e35f1 into masterAug 11, 2025
197 checks passed
@nfebe
nfebe deleted the fix/conditional-federation-placeholders branch August 11, 2025 18:21
Comment on lines 280 to 282
}
return this.config.showFederatedSharesAsInternal
return !this.config.showFederatedSharesAsInternal && !this.config.isFederationEnabled
? t('files_sharing', 'Email')
: t('files_sharing', 'Email, federated cloud ID')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This change looks suspicious.

I would have expected this.config.showFederatedSharesAsInternal || !this.config.isFederationEnabled?
@nfebe

@skjnldsvskjnldsv mentioned this pull request Aug 19, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: 🏗️ In progress

Development

Successfully merging this pull request may close these issues.

6 participants

@nfebe@mgallien@skjnldsv@come-nc@szaimen@nextcloud-command