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.

Sign up for GitHub

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

Jump to bottom

Allow apostrophes in custom button names #5010

Merged
merged 1 commit into from
Nov 29, 2018
Merged

Allow apostrophes in custom button names #5010

merged 1 commit into from
Nov 29, 2018

Conversation

mzazrivec
Copy link
Contributor

This is updated fix for #4900

In the problematic situation, we want to escape using j_str() rather than html_escape()

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

@miq-bot
Copy link
Member

miq-bot commented Nov 29, 2018

Checked commit mzazrivec@4f7e103 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
0 files checked, 0 offenses detected
Everything looks fine. 🍪

@himdel
Copy link
Contributor

himdel commented Nov 29, 2018

LGTM, the :javascript haml environment only expects valid JS, and handles the html escaping after that.

Tested in UI 👍
evil

@himdel himdel merged commit 402907f into ManageIQ:master Nov 29, 2018
@himdel himdel self-assigned this Nov 29, 2018
@himdel himdel added this to the Sprint 100 Ending Dec 3, 2018 milestone Nov 29, 2018
@mzazrivec mzazrivec deleted the allow_apostrophe_in_custom_button_names_2 branch November 29, 2018 14:15
simaishi pushed a commit that referenced this pull request Dec 3, 2018
@himdel @simaishi
Merge pull request #5010 from mzazrivec/allow_apostrophe_in_custom_bu…
6a27515 
…tton_names_2

Allow apostrophes in custom button names

(cherry picked from commit 402907f)

https://bugzilla.redhat.com/show_bug.cgi?id=1646905
@simaishi
Copy link
Contributor

simaishi commented Dec 3, 2018

Hammer backport details:

$ git log -1
commit 6a27515af7a4510ec1ed65abf0ae5d673f6d904d
Author: Martin Hradil <[email protected]>
Date:   Thu Nov 29 15:05:20 2018 +0100

    Merge pull request #5010 from mzazrivec/allow_apostrophe_in_custom_button_names_2
    
    Allow apostrophes in custom button names
    
    (cherry picked from commit 402907f08bfe79ab07cf13fd3639ccb1d8608fac)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1646905

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@himdel himdel

Labels
automation/automate bug hammer/backported
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mzazrivec @miq-bot @himdel @simaishi