Skip to content

Conversation

@nfebe
Copy link
Contributor

@nfebe nfebe commented Aug 7, 2025

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 owner August 7, 2025 05:20
@nfebe nfebe force-pushed the fix/conditional-federation-placeholders branch from be53ba4 to 0644472 Compare August 7, 2025 05:45
@nfebe nfebe requested a review from a team as a code owner August 7, 2025 05:45
@nfebe nfebe requested review from ArtificialOwl, provokateurin, salmart-dev and sorbaugh and removed request for a team, ArtificialOwl, salmart-dev, simonschaufi and sorbaugh August 7, 2025 05:45
@github-project-automation github-project-automation bot moved this to 🏗️ In progress in 📁 Files team Aug 7, 2025
@szaimen szaimen removed their request for review August 11, 2025 11:50
@szaimen szaimen added this to the Nextcloud 32 milestone Aug 11, 2025
Copy link
Contributor

@mgallien mgallien left a comment

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 nfebe force-pushed the fix/conditional-federation-placeholders branch from 0644472 to a5878c8 Compare August 11, 2025 16:35
@nfebe
Copy link
Contributor Author

nfebe commented Aug 11, 2025

/compile

@nfebe
Copy link
Contributor Author

nfebe commented Aug 11, 2025

/backport to stable31

@nfebe
Copy link
Contributor Author

nfebe commented Aug 11, 2025

/backport to stable30

@nextcloud-command nextcloud-command requested a review from a team as a code owner August 11, 2025 16:40
@nfebe nfebe force-pushed the fix/conditional-federation-placeholders branch from 06fb629 to 5e2f125 Compare August 11, 2025 17:03
@nfebe
Copy link
Contributor Author

nfebe commented Aug 11, 2025

/compile

@nfebe nfebe enabled auto-merge August 11, 2025 17:03
@nfebe nfebe changed the title fix(files_sharing): Implementation conditional federation placeholder fix(files_sharing): Implement conditional federation placeholder Aug 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 nfebe force-pushed the fix/conditional-federation-placeholders branch from 8674e92 to e7f4de6 Compare August 11, 2025 17:55
@nfebe
Copy link
Contributor Author

nfebe commented Aug 11, 2025

/compile

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@nfebe nfebe merged commit 49e35f1 into master Aug 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
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

@skjnldsv skjnldsv mentioned this pull request Aug 19, 2025
@skjnldsv skjnldsv modified the milestones: Nextcloud 32, Nextcloud 33 Sep 28, 2025
Sign up for free to 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.

7 participants