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: Bring back federated editing in viewer iframe #3669

Merged
merged 3 commits into from
Aug 21, 2024
Merged

Conversation

juliushaertl
Copy link
Member

@juliushaertl juliushaertl commented May 7, 2024

Quick attempt to fix #3605

Ideally we'd also remove the document.js usage there, but this at least brings back the functionality.

  • Try to come up with a cypress test

@juliushaertl juliushaertl added 2. developing Work in progress bug Something isn't working labels Jun 14, 2024
@juliushaertl juliushaertl changed the title WIP: fix federation with office.vue fix: Bring back federated editing in viewer iframe Aug 20, 2024
Copy link

cypress bot commented Aug 20, 2024



Test summary

9 0 5 0


Run details

Project Richdocuments
Status Passed
Commit 16eb17a
Started Aug 20, 2024 10:55 AM
Ended Aug 20, 2024 10:56 AM
Duration 01:11 💡
OS Linux Ubuntu -
Browser Electron 118

View run in Cypress Cloud ➡️


This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Cloud

@juliushaertl juliushaertl force-pushed the fix/federation branch 2 times, most recently from 0b01916 to 7196e7e Compare August 20, 2024 14:10
#[PublicPage]
#[NoCSRFRequired]
public function remotePost(string $shareToken, string $remoteServer, string $remoteServerToken, ?string $filePath = null): TemplateResponse {
return $this->remote($shareToken, $remoteServer, $remoteServerToken, $filePath);
Copy link
Member Author

Choose a reason for hiding this comment

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

This is needed as currently the routing cannot handle two routes with the same controller method name. We need one for POST and one for GET

Signed-off-by: Julius Härtl <jus@bitgrid.net>

chore: Move to route attributes

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl juliushaertl force-pushed the fix/federation branch 2 times, most recently from 845e677 to 8345f16 Compare August 21, 2024 07:54
This reverts commit f790b57.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl juliushaertl marked this pull request as ready for review August 21, 2024 10:55
@juliushaertl juliushaertl added 3. to review Ready to be reviewed and removed 2. developing Work in progress labels Aug 21, 2024
@juliushaertl
Copy link
Member Author

/backport to stable30

@juliushaertl
Copy link
Member Author

/backport to stable29

@juliushaertl
Copy link
Member Author

/backport to stable28

Copy link
Member

@mejo- mejo- left a comment

Choose a reason for hiding this comment

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

Didn't test and don't know the code well, but at least didn't spot anything obvious.

@juliushaertl juliushaertl merged commit be2b856 into main Aug 21, 2024
67 checks passed
@juliushaertl juliushaertl deleted the fix/federation branch August 21, 2024 11:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Ready to be reviewed bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Federated editing is broken after vue migration
3 participants