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

Escape timeline JSON properly #1075

Merged
merged 1 commit into from
Apr 26, 2017
Merged

Escape timeline JSON properly #1075

merged 1 commit into from
Apr 26, 2017

Conversation

himdel
Copy link
Contributor

@himdel himdel commented Apr 19, 2017

when used with %script, the resulting json is html-escaped and broken

using :javascript now, and moving the logic to a proper function

also removed code using empty hash to provide a default value for a json string.

https://bugzilla.redhat.com/show_bug.cgi?id=1440058

when used with %script, the resulting json is html-escaped and broken

using :javascript now, and moving the logic to a proper function

also removed code using empty hash to provide a default value for a json string

https://bugzilla.redhat.com/show_bug.cgi?id=1440058
@himdel
Copy link
Contributor Author

himdel commented Apr 19, 2017

@PanSpagetka can you verify this works in all the timelines please? (I don't have much timeline data..)

@miq-bot
Copy link
Member

miq-bot commented Apr 19, 2017

Checked commit https://github.com/himdel/manageiq-ui-classic/commit/0db9cb383e660541910edd80a29bc9a789281c71 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
0 files checked, 0 offenses detected
Everything looks good. 🍪

@PanSpagetka
Copy link
Contributor

@himdel Every timeline i tried works. So i give you this: 🐰

@mzazrivec mzazrivec self-assigned this Apr 26, 2017
@mzazrivec mzazrivec added this to the Sprint 60 Ending May 8, 2017 milestone Apr 26, 2017
@mzazrivec mzazrivec merged commit c0c98db into ManageIQ:master Apr 26, 2017
@himdel himdel deleted the bz1440058-json-escaped branch April 26, 2017 09:20
simaishi pushed a commit that referenced this pull request Jun 5, 2017
@simaishi
Copy link
Contributor

simaishi commented Jun 5, 2017

Fine backport details:

$ git log -1
commit 44f110804f5b7b3c15844432ee07e7f6a5b6f79e
Author: Milan Zázrivec <[email protected]>
Date:   Wed Apr 26 10:19:51 2017 +0200

    Merge pull request #1075 from himdel/bz1440058-json-escaped
    
    Escape timeline JSON properly
    (cherry picked from commit c0c98db1cdc91b62b8bb698996a6b511ecf00662)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1458896

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants