Merge pull request #14395 from zeari/delegate_custom_attributes_to_im…

…ages Delegate custom attributes to images in ChargebackContainerImage
ManageIQ · Mar 20, 2017 · 6d5d478 · 6d5d478
2 parents 46d5afc + b580851
commit 6d5d478
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/models/chargeback.rb b/app/models/chargeback.rb
@@ -60,7 +60,7 @@ def initialize(options, consumption)
     self.start_date, self.end_date, self.display_range = options.report_step_range(consumption.timestamp)
     self.interval_name = options.interval
     self.chargeback_rates = ''
-    self.entity = consumption.resource
+    self.entity ||= consumption.resource
   end
 
   def calculate_costs(consumption, rates)