Fixed a few more things. I wanna go to bed...

rtlong · Feb 16, 2010 · c12ee1f · c12ee1f
1 parent 7b0bbdb
commit c12ee1f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/app/helpers/contributions_helper.rb b/app/helpers/contributions_helper.rb
@@ -22,7 +22,7 @@ def delivery_method_display(contribution)
     when :mail, :pickup
       [DELIVERY_METHODS_DESCRIPTIONS[contribution.delivery_method.to_sym], contribution.delivery_details].compact.join ", "
     when :other
-      "it will get to you in the following method: #{contribution.delivery_details.strip}"
+      "it will get to you in the following method: #{(contribution.delivery_details || 'undefined').strip}"
     end
   end
 end
diff --git a/app/models/contribution.rb b/app/models/contribution.rb
@@ -11,6 +11,8 @@ class Contribution < ActiveRecord::Base
   accepts_nested_attributes_for :business
 
   validates_presence_of :nature, :value, :delivery_method
+  validates_inclusion_of :delivery_method, :in => DELIVERY_METHODS
+  validates_presence_of :delivery_details, :if => Proc.new { |contribution| contribution.delivery_method == :other }, :message => "Please explain the details of how we will get the contribution"
 
   named_scope :received, :condition => 'received_at IS NOT NULL'
 

diff --git a/app/views/admin/contributions/index.html.haml b/app/views/admin/contributions/index.html.haml
@@ -14,12 +14,15 @@
       %th{:colspan => 6} #{@contributions.count} Contributions
   %tbody
     - for contribution in @contributions
-      - content_tag_for :tr, contribution, :class => cycle('even','odd') do
+      %tr[contribution]{:class => cycle('even','odd')}
         %td= link_to contribution.nature, admin_business_contribution_path(contribution.business)
         %td= contribution.value
         %td= link_to contribution.business.name, admin_business_path(contribution.business)
-        %td= delivery_method_display(contribution)
-        %td.received_at
+        %td.delivery<
+          %span.method>= contribution.delivery_method.to_s.humanize
+          - if contribution.delivery_details?
+            %span.details> : #{contribution.delivery_details} 
+        %td.received_at<
           - if contribution.received?
             = contribution.received_at.to_words
           - else

diff --git a/public/stylesheets/sass/admin.sass b/public/stylesheets/sass/admin.sass
@@ -30,6 +30,9 @@ form.formtastic
   fieldset
     :border-color = !primary_color
 
+    .inline-errors
+      :color = !color3
+
 table
   tr
     th