Make Canvas Integration work with new UI #1749
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Note: This is a hack, and should be done more elegantly. We should not be using dangerouslySetInnerHTML.
|
We're really just looking for a green codebuild - as it's running in New UI mode. |
edalex-ian
commented
May 20, 2020
Source/Plugins/Core/com.equella.core/scalasrc/com/tle/web/api/LegacyContentApi.scala
Outdated
Show resolved
Hide resolved
edalex-ian
commented
May 20, 2020
Source/Plugins/Core/com.equella.core/scalasrc/com/tle/web/api/LegacyContentApi.scala
Outdated
Show resolved
Hide resolved
edalex-ian
commented
May 20, 2020
Source/Plugins/Core/com.equella.core/scalasrc/com/tle/web/api/LegacyContentApi.scala
Outdated
Show resolved
Hide resolved
edalex-ian
commented
May 20, 2020
Rather than using security risk dangerouslySetInnerHtml. Also - remove test strings from LegacyContentApi.scala and use idiomatic Scala code to setup the form.
|
@edalex-ian All feedback has been addressed. |
|
Heya @SammyIsConfused , Before we all now do the proper review we'll want it point to the hotfix branch or the like. |
|
Looks okay to me, but seeing I raised it I can't explicitly approve. I do wonder if we can improve the Option/Some stuff - seems rather verbose - but that's okay. :) |
|
Oh @SammyIsConfused , don't forget we also need to 'forward' port this onto |
SammyIsConfused
added a commit
that referenced
this pull request
May 22, 2020
…round Make Canvas Integration work with new UI
SammyIsConfused
added a commit
that referenced
this pull request
May 22, 2020
…round Make Canvas Integration work with new UI
SammyIsConfused
added a commit
that referenced
this pull request
May 28, 2020
…round Make Canvas Integration work with new UI
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
Description of change
Solves #1744. The problem was that the LegacyContentApi did not set up the form correctly in the returnResult method, and the frontend wasn't expecting it to contain the form snippet that caused content to be submitted to Canvas.