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

Fixed reading of ems_refresh_threshold memory_threshold value #4925

Conversation

h-kataria
Copy link
Contributor

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

Value was getting saved properly but need to point to right key in the hash while reading it back to populate the drop down with correct saved value

@h-kataria h-kataria added the wip label Nov 14, 2018
@h-kataria h-kataria changed the title Fixed reading of ems_refresh_threshold memory_threshold value [WIP] - Fixed reading of ems_refresh_threshold memory_threshold value Nov 14, 2018
@miq-bot
Copy link
Member

miq-bot commented Nov 14, 2018

Checked commit h-kataria@e8c9205 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
1 file checked, 1 offense detected

**

  • 💣 💥 🔥 🚒 - Linter/Haml - Linter::Haml STDERR:
warning: parser/current is loading parser/ruby23, which recognizes
warning: 2.3.6-compliant syntax, but you are running 2.3.3.
warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri.

Copy link
Contributor

@lgalis lgalis left a comment

Choose a reason for hiding this comment

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

Looks good.

@h-kataria h-kataria changed the title [WIP] - Fixed reading of ems_refresh_threshold memory_threshold value Fixed reading of ems_refresh_threshold memory_threshold value Nov 14, 2018
@h-kataria h-kataria removed the wip label Nov 14, 2018
@dclarizio dclarizio merged commit c37d42c into ManageIQ:master Nov 14, 2018
@dclarizio dclarizio added this to the Sprint 99 Ending Nov 19, 2018 milestone Nov 14, 2018
@simaishi
Copy link
Contributor

@h-kataria there is a conflict backporting to Hammer branch. Please create a separate PR.

diff --cc app/views/ops/_settings_workers_tab.html.haml
index dba287dd1,bfa1f4b8f..000000000
--- a/app/views/ops/_settings_workers_tab.html.haml
+++ b/app/views/ops/_settings_workers_tab.html.haml
@@@ -207,7 -207,7 +207,11 @@@
            .col-md-8
              = select_tag('ems_refresh_worker_threshold',
                            options_for_select(@sb[:ems_refresh_threshold],
++<<<<<<< HEAD
 +                                              @edit[:new].get_raw_worker_setting(:MiqEmsRefreshWorker, :memory_threshold)),
++=======
+                                               @edit[:new][:workers][:worker_base][:queue_worker_base][:ems_refresh_worker][:defaults][:memory_threshold]),
++>>>>>>> c37d42cef... Merge pull request #4925 from h-kataria/fixed_reading_of_refresh_worker_memory_threshold_value
                            :class    => "selectpicker")
            :javascript
              miqSelectPickerEvent('ems_refresh_worker_threshold', "#{url}")

@simaishi
Copy link
Contributor

Backported to Hammer via #4931

@h-kataria h-kataria deleted the fixed_reading_of_refresh_worker_memory_threshold_value branch April 9, 2019 22:05
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