Require that city and country be included on all new addresses.

djcp · Jun 25, 2009 · 271c37c · 271c37c
1 parent e562ee9
commit 271c37c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/models/contact.rb b/app/models/contact.rb
@@ -16,7 +16,7 @@ class Contact < ActiveRecord::Base
     :reject_if => proc { |attributes| attributes['email'].blank? }
 
   accepts_nested_attributes_for :contact_addresses, :allow_destroy => true, 
-    :reject_if => proc { |attributes| attributes['street1'].blank? }
+    :reject_if => proc { |attributes| (attributes['city'].blank? or attributes['country'].blank?) ? true : false }
 
   accepts_nested_attributes_for :contact_urls, :allow_destroy => true, 
     :reject_if => proc { |attributes| attributes['url'].blank? }

diff --git a/app/views/contacts/edit.html.erb b/app/views/contacts/edit.html.erb
@@ -39,6 +39,7 @@
         </tr>
       <% end %>
     </table>
+    <p><strong>City and Country are required on new addresses.</strong></p>
   </div>
 
   <h2 id="flyout-contact-contact-info" class="toggle shown">Contact Info</h2>