Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(share): render conflict modal in public shares #49924

Merged
merged 2 commits into from
Dec 19, 2024

Conversation

max-nextcloud
Copy link
Contributor

Handle templates with license comments in octemplate.js.

Summary

apps/files/templates/fileexists.html now starts with a comment.

this.elem.get(0).outerHTML would extract the comment rather than the templat

Screenshot after the fix

grafik

Checklist

  • Code is properly formatted
  • Sign-off message is added to all commits
  • Tests (unit, integration, api and/or acceptance) are included
  • Screenshots before/after for front-end changes
  • Documentation is not required
  • Backports are not required (this bug is on stable30 only)

Handle templates with license comments in `octemplate.js`.

Signed-off-by: Max <max@nextcloud.com>
Copy link
Member

@provokateurin provokateurin left a comment

Choose a reason for hiding this comment

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

Fun 🙃

@provokateurin
Copy link
Member

/compile

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@max-nextcloud max-nextcloud merged commit e703507 into stable30 Dec 19, 2024
113 checks passed
@max-nextcloud max-nextcloud deleted the fix/link-share-conflict-modal branch December 19, 2024 11:01
@skjnldsv
Copy link
Member

Nice catch and thanks for the fix Max!!

@blizzz blizzz mentioned this pull request Jan 8, 2025
17 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants