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

Hide History toolbar when in Reports Import/Export tree #1909

Merged
merged 1 commit into from Aug 15, 2017

Conversation

GregP
Copy link
Contributor

@GregP GregP commented Aug 15, 2017

Do not display History Toolbar when in Reports => Import / Export tree, no history to be available/selected.

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

Screen shot prior to fix:
bz1393193_reports import export history dropdown prior to code fix

===================
Screen shots post fix:

bz1393193_reports export hide historytoolbar post fix

bz1393193_reports export hide historytoolbar custom rpts node post fix

@GregP
Copy link
Contributor Author

GregP commented Aug 15, 2017

@h-kataria Ready for review.

@@ -687,7 +687,7 @@ def replace_right_cell(options = {}) # :replace_trees key can be an array of tr
partial = options[:partial] ? options[:partial] : set_partial_name
unless @in_a_form
c_tb = build_toolbar(center_toolbar_filename)
h_tb = build_toolbar("x_history_tb")
h_tb = build_toolbar("x_history_tb") unless (x_active_tree == "export_tree" || params[:id] == "export_accord")
Copy link
Contributor

Choose a reason for hiding this comment

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

@GregP please change check to unless x_active_tree == :export_tree that should be good enough, value of x_active_tree is a symbol not string

@GregP GregP force-pushed the hide_history_tb_report_export branch from 5033cd1 to b9afb5c Compare August 15, 2017 14:51
@miq-bot
Copy link
Member

miq-bot commented Aug 15, 2017

Checked commit GregP@b9afb5c with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
1 file checked, 0 offenses detected
Everything looks fine. 🏆

@h-kataria
Copy link
Contributor

looks good.

@h-kataria h-kataria added this to the Sprint 67 Ending Aug 21, 2017 milestone Aug 15, 2017
@h-kataria h-kataria merged commit b7bf129 into ManageIQ:master Aug 15, 2017
simaishi pushed a commit that referenced this pull request Aug 15, 2017
Hide History toolbar when in Reports Import/Export tree
(cherry picked from commit b7bf129)

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

Fine backport details:

$ git log -1
commit 3e044f85ef51f1467470169f16c5af8858f68aff
Author: Harpreet Kataria <hkataria@redhat.com>
Date:   Tue Aug 15 11:36:58 2017 -0400

    Merge pull request #1909 from GregP/hide_history_tb_report_export
    
    Hide History toolbar when in Reports Import/Export tree
    (cherry picked from commit b7bf129740ee6ffcea7e1fbd956686358a3caf6a)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1481853

@h-kataria h-kataria self-assigned this Aug 16, 2017
@simaishi
Copy link
Contributor

simaishi commented Sep 1, 2017

@h-kataria Would it be ok to backport this to Euwe branch?

@h-kataria
Copy link
Contributor

@simaishi yes, good to be be backported to EUWE

@simaishi
Copy link
Contributor

simaishi commented Sep 1, 2017

Euwe backport (to manageiq repo) details:

$ git log -1
commit 43008155f42561998ce2025b6aa320168be8da84
Author: Harpreet Kataria <hkataria@redhat.com>
Date:   Tue Aug 15 11:36:58 2017 -0400

    Merge pull request #1909 from GregP/hide_history_tb_report_export
    
    Hide History toolbar when in Reports Import/Export tree
    (cherry picked from commit b7bf129740ee6ffcea7e1fbd956686358a3caf6a)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1487686

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.

None yet

5 participants