seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-1458 fixed location selection

This commit is contained in:
Jonathan Kolyer 2014-06-30 03:13:40 +00:00
parent 6c05fb5ad1
commit c95bebef48
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
web/app/assets/javascripts/landing/signup.js
View File

@ -45,7 +45,9 @@
$.ajax('/api/regions', {
data : { country: selected_country },
dataType : 'json'
}).done(regions_done).fail(regions_fail).always(function() { region_select.attr('disabled', false).easyDropDown('enable') })
}).done(regions_done)
.fail(function(err) { regions_done([]) })
.always(function() { region_select.attr('disabled', false).easyDropDown('enable') })
}
})
@ -56,16 +58,13 @@
$(data.regions).each(function(index, item) {
var option = $('<option></option>');
option.text(item);
option.val(item);
option.text(item['name']);
option.val(item['region']);
region_select.append(option)
})
context.JK.dropdown(region_select);
}
function regions_fail() {
alert("something went wrong in looking up regions")
cities_done([]);
}
region_select.change(function() {
@ -80,7 +79,12 @@
$.ajax('/api/cities', {
data : { country: selected_country, region: selected_region },
dataType : 'json'
}).done(cities_done).fail(cities_fail).always(function() { city_select.attr('disabled', false).easyDropDown('enable') })
})
.done(cities_done)
.error(function(err) {
cities_done([]);
})
.always(function() { city_select.attr('disabled', false).easyDropDown('enable') })
}
})
@ -97,10 +101,6 @@
context.JK.dropdown(city_select);
}
function cities_fail() {
alert("something went wrong in looking up cities")
}
}
signup.handle_completion_submit = function handle_completion_submit() {

2
web/app/views/users/new.html.erb
View File

@ -54,7 +54,7 @@
<option value="" <%= @location[:state].blank? ? "selected" : "" %>>State/Province</option>
<% @regions.each do |region| %>
<% unless region.blank? %>
<option value="<%= region %>" <%= @location[:state] == region ? "selected" : "" %>><%= region %></option>
<option value="<%= region[:region] %>" <%= @location[:state] == region ? "selected" : "" %>><%= region[:name] %></option>
<% end %>
<% end %>