Merge pull request #1990 from lpichler/fix_filter_tab_for_chargeback_…

…report_for_all_providers Fix filter tab for chargeback report for all providers (cherry picked from commit 1c3311d) https://bugzilla.redhat.com/show_bug.cgi?id=1487321
ManageIQ · Aug 31, 2017 · 2ba97f4 · 2ba97f4
1 parent f8491a7
commit 2ba97f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/helpers/report_helper/editor.rb b/app/helpers/report_helper/editor.rb
@@ -1,6 +1,6 @@
 module ReportHelper::Editor
   def cb_entities_by_provider_id(provider_id, entity_type)
-    provider = ManageIQ::Providers::ContainerManager.find(provider_id)
+    provider = ManageIQ::Providers::ContainerManager.find_by(:id => provider_id)
     return [] if provider.nil?
     case entity_type.underscore.to_sym
     when :container_project

diff --git a/app/views/report/_form_filter_chargeback.html.haml b/app/views/report/_form_filter_chargeback.html.haml
@@ -85,7 +85,7 @@
           :javascript
              miqInitSelectPicker();
              miqSelectPickerEvent('cb_provider_id', '#{url}', {beforeSend: true, complete: true});
-      - if @edit[:new][:cb_provider_id].present?
+      - if @edit[:new][:cb_provider_id].present? && @edit[:new][:cb_provider_id].try(:to_sym) != :all
         .form-group
           %label.control-label.col-md-2
             = ui_lookup(:model => @edit[:new][:cb_model])