gaku 0.2.2 → 0.2.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (56) hide show
  1. checksums.yaml +4 -4
  2. data/VERSION +1 -1
  3. data/admin/app/assets/javascripts/gaku/admin/base.js.coffee +12 -1
  4. data/admin/app/controllers/gaku/admin/campuses/addresses_controller.rb +2 -0
  5. data/admin/app/controllers/gaku/admin/presets_controller.rb +18 -1
  6. data/admin/app/controllers/gaku/admin/states_list_controller.rb +20 -0
  7. data/admin/app/helpers/gaku/shared_helper.rb +14 -4
  8. data/admin/app/views/gaku/admin/campuses/addresses/_addresses.html.slim +1 -1
  9. data/admin/app/views/gaku/admin/campuses/addresses/_form_fields.html.slim +10 -11
  10. data/admin/app/views/gaku/admin/home/index.html.slim +4 -3
  11. data/admin/app/views/gaku/admin/presets/_address.html.slim +4 -2
  12. data/admin/app/views/gaku/admin/presets/_no_states_select.html.slim +1 -0
  13. data/admin/app/views/gaku/admin/presets/_states_select.html.slim +3 -0
  14. data/admin/app/views/gaku/admin/presets/edit.js.erb +7 -1
  15. data/admin/app/views/gaku/admin/presets/states_list.js.erb +5 -0
  16. data/admin/app/views/gaku/admin/states_list/_no_states_select.html.slim +4 -0
  17. data/admin/app/views/gaku/admin/states_list/_states_select.html.slim +3 -0
  18. data/admin/app/views/gaku/admin/states_list/index.js.erb +5 -0
  19. data/admin/config/routes.rb +5 -3
  20. data/admin/gaku_admin.gemspec +2 -2
  21. data/admin/lib/tasks/admin_user.rake +3 -2
  22. data/admin/spec/features/presets/address_preset_spec.rb +6 -6
  23. data/admin/spec/features/schools/campuses/addresses_spec.rb +3 -3
  24. data/common_gaku_dependencies.rb +1 -1
  25. data/core/app/controllers/gaku/core_controller.rb +3 -0
  26. data/core/app/models/gaku/country.rb +11 -1
  27. data/core/app/models/gaku/preset.rb +17 -0
  28. data/core/app/models/gaku/state.rb +14 -1
  29. data/core/db/default/gaku/countries.rb +14 -0
  30. data/core/db/default/gaku/presets.rb +1 -1
  31. data/core/db/default/gaku/states.rb +9 -0
  32. data/core/db/migrate/20150213095508_improve_countries_and_states.rb +5 -0
  33. data/core/gaku_core.gemspec +1 -0
  34. data/core/lib/gaku/core.rb +1 -0
  35. data/frontend/app/assets/javascripts/gaku/frontend/base.js.coffee +12 -1
  36. data/frontend/app/controllers/gaku/addresses_controller.rb +3 -2
  37. data/{admin/app/controllers/gaku/states_controller.rb → frontend/app/controllers/gaku/states_list_controller.rb} +6 -4
  38. data/frontend/app/views/gaku/addresses/_form_fields.html.slim +2 -3
  39. data/frontend/app/views/gaku/addresses/edit.js.erb +1 -1
  40. data/frontend/app/views/gaku/home/index.html.slim +1 -3
  41. data/frontend/app/views/gaku/states_list/_no_states_select.html.slim +4 -0
  42. data/frontend/app/views/gaku/states_list/_states_select.html.slim +3 -0
  43. data/frontend/app/views/gaku/states_list/index.js.erb +5 -0
  44. data/frontend/config/routes.rb +2 -0
  45. data/frontend/gaku_frontend.gemspec +2 -2
  46. data/sample/lib/shared_sample_data.rb +1 -1
  47. metadata +27 -23
  48. data/admin/app/views/gaku/states/_no_states_select.html.slim +0 -1
  49. data/admin/app/views/gaku/states/_states_select.html.slim +0 -1
  50. data/admin/app/views/gaku/states/index.js.erb +0 -5
  51. data/core/db/default/gaku/countries.yml +0 -1357
  52. data/core/db/default/gaku/states.yml +0 -494
  53. data/frontend/app/controllers/gaku/states_controller.rb +0 -17
  54. data/frontend/app/views/gaku/states/_no_states_select.html.slim +0 -1
  55. data/frontend/app/views/gaku/states/_states_select.html.slim +0 -1
  56. data/frontend/app/views/gaku/states/index.js.erb +0 -5
data/frontend/app/controllers/gaku/states_controller.rb DELETED
@@ -1,17 +0,0 @@
1
- module Gaku
2
- class StatesController < GakuController
3
- respond_to :js, :json
4
-
5
- def index
6
- if params[:country_id]
7
- @country = Country.find(params[:country_id])
8
- @states = State.where(country_iso: @country.iso)
9
- .order('name asc')
10
- else
11
- @states = State.all
12
- end
13
-
14
- respond_with @states
15
- end
16
- end
17
- end
data/frontend/app/views/gaku/states/_no_states_select.html.slim DELETED
@@ -1 +0,0 @@
1
- = collection_select(:address, :state_id, states, :id, :name, {prompt: t(:'address.state.choose') }, disabled: true, class: 'span12 form-control')
data/frontend/app/views/gaku/states/_states_select.html.slim DELETED
@@ -1 +0,0 @@
1
- = collection_select(:address, :state_id, states, :id, :name, {prompt: t(:'address.state.choose') }, class: 'span12 form-control')
data/frontend/app/views/gaku/states/index.js.erb DELETED
@@ -1,5 +0,0 @@
1
- if(<%= @states.count %> > 0 ){
2
- $('#state-dropdown .controls').html("<%=j render 'states_select', states: @states%>")
3
- }else{
4
- $('#state-dropdown .controls').html("<%=j render 'no_states_select', states: @states%>")
5
- }