Fix button when adding a filter in Cloud Providers

[hstastna]

fixing ManageIQ/manageiq#13219
and also
ManageIQ/manageiq#13195

Fix adding advanced search expression element by clicking
on commit button (or okay button) in Compute -> Clouds -> Providers.

[hstastna]

@miq-bot add_label wip

[hstastna]

if you look into the code, there will be question that if we should remove that whole line at all. I am not sure about that, because it doesn't work only in some places, so I added the condition there. @h-kataria could you please look at it? Thanks.

[miq-bot]

This pull request is not mergeable. Please rebase and repush.

[hstastna]

@miq-bot remove_label wip

[miq-bot]

Checked commit hstastna@6cfb6e2 with ruby 2.2.6, rubocop 0.46.0, and haml-lint 0.19.0
1 file checked, 2 offenses detected

app/controllers/application_controller/filter.rb

• ❕ - Line 310, Col 11 - Metrics/BlockNesting - Avoid more than 3 levels of block nesting.
• ❕ - Line 310, Col 121 - Metrics/LineLength - Line is too long. [153/120]

[h-kataria]

upstream BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1414470

[simaishi]

Euwe backport conflict:

$ git cherry-pick -x -e -m 1 -Xsubtree=/ 27b3103
error: could not apply 27b3103... Merge pull request #142 from hstastna/Okay_button_Advanced_search_Cloud_Providers

$ git diff
diff --cc app/controllers/application_controller/filter.rb
index d7e4124,05944ec..0000000
--- a/app/controllers/application_controller/filter.rb
+++ b/app/controllers/application_controller/filter.rb
@@@ -656,10 -306,8 +656,15 @@@ module ApplicationController::Filte
            add_flash(_("%{model} search \"%{name}\" was saved") %
              {:model => ui_lookup(:model => @edit[@expkey][:exp_model]),
               :name => @edit[:new_search_name]})
++<<<<<<< HEAD
 +          adv_search_build_lists
 +          # Save the last search loaded (saved)
 +          @edit[@expkey][:exp_last_loaded] = {:id => s.id, :name => s.name, :description => s.description, :typ => s.search_type}
 +          @edit[:new_search_name] = @edit[:adv_search_name] = @edit[@expkey][:exp_last_loaded][:description]
++=======
+           @edit[@expkey].select_filter(s)
+           @edit[:new_search_name] = @edit[:adv_search_name] = @edit[@expkey][:exp_last_loaded][:description] unless @edit[@expkey][:exp_last_loaded].nil?
++>>>>>>> 27b3103... Merge pull request #142 from hstastna/Okay_button_Advanced_search_Cloud_Providers
            @edit[@expkey][:expression] = copy_hash(@edit[:new][@expkey])
            # Build the expression table
            @edit[@expkey][:exp_table] = exp_build_table(@edit[@expkey][:expression])

[simaishi]

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

[simaishi]

Ah, this needs to be backported after #98. Will try again.

[hstastna]

this PR resolves all the conflicts: ManageIQ/manageiq#13621

[simaishi]

Backported to Euwe via ManageIQ/manageiq#13621