Fix amount_to_s for booking templates showing % when absolute.

huerlisi · Apr 18, 2011 · a6e5d48 · a6e5d48
1 parent df0288d
commit a6e5d48
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/app/helpers/booking_template_helper.rb b/app/helpers/booking_template_helper.rb
@@ -8,7 +8,7 @@ def amount_relations_as_collection
   end
 
   def amount_to_s(booking_template)
-    if booking_template.amount_relates_to
+    if booking_template.amount_relates_to.present?
       return "%.2f%%" % (booking_template.amount.to_f * 100)
     else
       return currency_fmt(booking_template.amount)

diff --git a/app/views/booking_templates/_booking_template.html.haml b/app/views/booking_templates/_booking_template.html.haml
@@ -14,4 +14,3 @@
     = list_link_for(:edit, booking_template)
     = list_link_for(:delete, booking_template)
     =# link_to image_tag('16x16/copy.png', :title => 'Copy'), copy_booking_template_path(booking_template), :remote => true
-
diff --git a/app/views/charge_booking_templates/_charge_booking_template.html.haml b/app/views/charge_booking_templates/_charge_booking_template.html.haml
@@ -13,4 +13,3 @@
   %td.action-links
     = list_link_for(:edit, charge_booking_template)
     = list_link_for(:delete, charge_booking_template)
-