Merge pull request #2407 from lpichler/offer_unit_in_rate_editor

Use Chargeable field for determining measure in rate editor
ManageIQ · Oct 17, 2017 · 2e04349 · 2e04349
2 parents 930f648 + 9e967cd
commit 2e04349
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/app/controllers/chargeback_controller.rb b/app/controllers/chargeback_controller.rb
@@ -515,12 +515,11 @@ def cb_rate_set_form_vars
       temp[:per_time] ||= "hourly"
 
       temp[:currency] = detail.detail_currency.id
-      temp[:detail_measure] = detail.detail_measure
 
-      if detail.detail_measure.present?
+      if detail.chargeable_field.detail_measure.present?
         temp[:detail_measure] = {}
-        temp[:detail_measure][:measures] = detail.detail_measure.measures
-        temp[:chargeback_rate_detail_measure_id] = detail.detail_measure.id
+        temp[:detail_measure][:measures] = detail.chargeable_field.detail_measure.measures
+        temp[:chargeback_rate_detail_measure_id] = detail.chargeable_field.detail_measure.id
       end
 
       temp[:id] = params[:pressed] == 'chargeback_rates_copy' ? nil : detail.id