Fix some null pointer errors.

2011-07-30 00:24:24 +02:00 · 2011-07-30 00:24:24 +02:00 · 50aef5717d
commit 50aef5717d
parent fbfe01da32
1 changed files with 9 additions and 5 deletions
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@ -17,13 +17,17 @@ class Contact < ActiveRecord::Base
  end

  def address_string
-    s = street || ""
+    if address.nil?
+      return ""
+    end
+
+    s = address.street || ""
    s += " "
-    s += housenr || ""
-    s += "&middot;" unless (plz.nil? and place.nil?)
-    s += plz
+    s += address.housenr || ""
+    s += "&middot;" unless (address.zipcode.nil? and address.place.nil?)
+    s += address.zipcode
    s += " "
-    s += place
+    s += address.place
  end

  # very temporary