From 704bffcd1d1d49bbb00241b96bacf22e5a750f26 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 25 Nov 2015 21:55:29 -0500 Subject: addresses adding properly --- StoneIsland/www/js/lib/nav/AddressView.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'StoneIsland/www/js/lib/nav/AddressView.js') diff --git a/StoneIsland/www/js/lib/nav/AddressView.js b/StoneIsland/www/js/lib/nav/AddressView.js index fb30062e..9d4a97b9 100644 --- a/StoneIsland/www/js/lib/nav/AddressView.js +++ b/StoneIsland/www/js/lib/nav/AddressView.js @@ -18,9 +18,7 @@ var AddressView = SerializableView.extend({ data.Address1 = address[0] data.Address2 = address[1] this.$(".address input").val("") - Object.keys(data).forEach(function(key){ - this.$(".address [name=" + key + "]").val(data[key]) - }.bind(this)) + this.load_data(data) }, validate_presence: { @@ -33,12 +31,11 @@ var AddressView = SerializableView.extend({ validate_fields: function(data, errors){ if (data.Phone.replace(/[^0-9]/g, "").length < 10) { errors.push([ "Phone", "Phone numbers must be at least 10 digits." ]) } - if (data.Province == "NONE") { errors.push([ "Province", "Please choose your state." ]) } + if (! data.Province || data.Province == "NONE") { errors.push([ "Province", "Please choose your state." ]) } data.Address = data.Address1 + "\n" + data.Address2 data.UserId = auth.user_id delete data.Address1 delete data.Address2 - console.log(errors) }, }) -- cgit v1.2.3-70-g09d2