Merge pull request #17188 from hstastna/Default_Container_Image_Rate_…

…edit Refactor ensure_nondefault method for chargeback rate
ManageIQ · Apr 6, 2018 · 60e46a2 · 60e46a2
2 parents c7d1580 + f2349af
commit 60e46a2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/models/chargeback_rate.rb b/app/models/chargeback_rate.rb
@@ -132,6 +132,10 @@ def assigned_tags?
     get_assigned_tos[:tags].present?
   end
 
+  def default?
+    super || description == 'Default Container Image Rate'
+  end
+
   ###########################################################
 
   private
@@ -150,7 +154,7 @@ def ensure_unassigned
   end
 
   def ensure_nondefault
-    if default? || description == 'Default Container Image Rate'
+    if default?
       errors.add(:rate, "default rate cannot be deleted")
       throw :abort
     end