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

Fix missing Smart State Analysis button on Cloud Instances list view #12559

Merged

Conversation

jzigmund
Copy link

@jzigmund jzigmund commented Nov 10, 2016

Use different class for instance_scan to display Smart State Analysis on Instance list view as the class used for one Instance (where we can detect if the button should be visible or not - depends on support of Smart State on the instance).

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

@jzigmund
Copy link
Author

@miq-bot add_label ui,bug

@jzigmund
Copy link
Author

Before fix:
screenshot from 2016-11-10 17-42-52
After fix:
screenshot from 2016-11-10 17-42-04

@miq-bot
Copy link
Member

miq-bot commented Nov 11, 2016

Checked commits jzigmund/manageiq@3ff61f3~...e63f2a0 with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1
4 files checked, 2 offenses detected

spec/helpers/application_helper/buttons/basic_image_spec.rb

@jzigmund
Copy link
Author

@romanblanco could you please review this ?

@miq-bot miq-bot assigned romanblanco and unassigned martinpovolny Nov 30, 2016
@romanblanco
Copy link
Member

Tested in UI, fixes the issue 👍

@martinpovolny martinpovolny added this to the Sprint 50 Ending Dec 5, 2016 milestone Dec 1, 2016
@martinpovolny martinpovolny merged commit fb15bf9 into ManageIQ:master Dec 1, 2016
@simaishi
Copy link
Contributor

simaishi commented Jan 9, 2017

Euwe backport conflict:

$ git cherry-pick -e -x -m 1 fb15bf9
error: could not apply fb15bf9... Merge pull request #12559 from jzigmund/bz1389055-smartstate_analysis_missing
$ git diff
diff --cc app/helpers/application_helper/toolbar/vm_clouds_center.rb
index e591880,3484666..0000000
--- a/app/helpers/application_helper/toolbar/vm_clouds_center.rb
+++ b/app/helpers/application_helper/toolbar/vm_clouds_center.rb
@@@ -25,8 -25,8 +25,13 @@@ class ApplicationHelper::Toolbar::VmClo
            :url_parms => "main_div",
            :confirm   => N_("Perform SmartState Analysis on the selected items?"),
            :enabled   => false,
++<<<<<<< HEAD
 +          :onwhen    => "1+",
 +          :klass     => ApplicationHelper::Button::VmInstanceScan),
++=======
+           :klass     => ApplicationHelper::Button::BasicImage,
+           :onwhen    => "1+"),
++>>>>>>> fb15bf9... Merge pull request #12559 from jzigmund/bz1389055-smartstate_analysis_missing
          button(
            :instance_compare,
            'product product-compare fa-lg',
* Unmerged path app/helpers/application_helper/button/vm_instance_template_scan.rb

@simaishi
Copy link
Contributor

simaishi commented Jan 9, 2017

@jzigmund Please resolve conflict and make Euwe-specific PR (referencing this one) or suggest other PRs to backport.

jzigmund pushed a commit to jzigmund/manageiq that referenced this pull request Jan 11, 2017
…analysis_missing

Fix missing Smart State Analysis button on Cloud Instances list view
(cherry picked from commit fb15bf9)
@simaishi
Copy link
Contributor

Backported to Euwe via #13422

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