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

Fixed Secondary filter to be added/edited correctly. #3747

Merged
merged 1 commit into from
Apr 11, 2018
Merged

Fixed Secondary filter to be added/edited correctly. #3747

merged 1 commit into from
Apr 11, 2018

Conversation

h-kataria
Copy link
Contributor

  • Fixed alignment of Haml code.
  • Passing in a local variable to form_expression_button view to be used as an button action and also to load/display correct primary/secondary filter

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1565171
Issue introduced in #2040

@epwinchell please review/test.

before:
before

after:
report_filter_after

@h-kataria h-kataria assigned dclarizio and mzazrivec and unassigned dclarizio Apr 10, 2018
@h-kataria
Copy link
Contributor Author

@mzazrivec please review/merge

@h-kataria
Fixed Secondary filter to be added/edited correctly.
15f915f 
- Fixed alignment of Haml code.
- Passing in a local variable to form_expression_button view to be used as an button action and also to load/display correct primary/secondary filter

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1565171
@h-kataria h-kataria force-pushed the report_filter_secondary_expression_fixed branch from f71540b to 15f915f Compare April 10, 2018 19:57
@miq-bot
Copy link
Member

miq-bot commented Apr 10, 2018

Checked commit h-kataria@15f915f with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
1 file checked, 0 offenses detected
Everything looks fine. ⭐

@mzazrivec mzazrivec added this to the Sprint 84 Ending Apr 23, 2018 milestone Apr 11, 2018
@mzazrivec mzazrivec merged commit e825c3d into ManageIQ:master Apr 11, 2018
@h-kataria h-kataria deleted the report_filter_secondary_expression_fixed branch April 16, 2018 20:49
simaishi pushed a commit that referenced this pull request May 15, 2018
@mzazrivec @simaishi
Merge pull request #3747 from h-kataria/report_filter_secondary_expre…
6b11a33 
…ssion_fixed

Fixed Secondary filter to be added/edited correctly.
(cherry picked from commit e825c3d)

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

Gaprindashvili backport details:

$ git log -1
commit 6b11a33e126d39bd6d7e70e36bdd9d02c3ca3748
Author: Milan Zázrivec <mzazrivec@redhat.com>
Date:   Wed Apr 11 11:48:41 2018 +0200

    Merge pull request #3747 from h-kataria/report_filter_secondary_expression_fixed
    
    Fixed Secondary filter to be added/edited correctly.
    (cherry picked from commit e825c3d7b9e48fd31bdbbbb28646500b5383e5a6)
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1578400

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

@mzazrivec mzazrivec

Labels
blocker bug gaprindashvili/backported overview/reporting
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@h-kataria @miq-bot @simaishi @dclarizio @mzazrivec