gaku_frontend 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23b7a503f4fff6f766d3ce5fc0d4838670ee7b47
-  data.tar.gz: 0b077bf6dc3c9411ad2d79aa98f4c5cfcb823cfb
+  metadata.gz: de0b5133f209bcec14995e2ec091d518e11e7882
+  data.tar.gz: 18eb6ce2a8b00963e7abfe195e283011bab34500
 SHA512:
-  metadata.gz: 2c54ee01cb05f1518b17898e18c12e13e4370d1d8a47abd3ff5b2b31a2008d5e0e5bd9b30fb0932447049cce6b8a43569d635ceac335549e275212935fe7e340
-  data.tar.gz: c2688bad7d4ee07c582f7d5baf664998472fe6132a92f1cf11301f6f7174dfc5fac42f85e18045403eefefe5e13f6e4a6b619dcb75198d79204e6e1deb8f6703
+  metadata.gz: 139beeb8df66b8498e15f49c887616c8aa70a1959ca1d1d3b495727da515c7a2558c8cb4502d183739952f41f7dc1865be06dce64b842b0d54d8d207ef531243
+  data.tar.gz: e5ef82c4542c6533e99979702881fa820b27998992a1b6d2baa83279927923b3f14b9b0b29994fe7ed5c656280989ea42456ac6ad946184fa7e1caf7e4c2dbc0

data/app/assets/javascripts/gaku/frontend/base.js.coffee

@@ -47,11 +47,22 @@ window.load_states = ->
   if countryCode
     $.ajax
       type: 'get'
-      url: '/states'
+      url: '/states_list'
       dataType: 'script'
       data:
         country_id: countryCode
 
+window.load_edit_states = (state_id) ->
+  countryCode = $("#country_dropdown option:selected").val()
+  if countryCode
+    $.ajax
+      type: 'get'
+      url: '/states_list'
+      dataType: 'script'
+      data:
+        country_id: countryCode
+        state_id: state_id
+
 class App
   init: ->
 

data/app/controllers/gaku/addresses_controller.rb

@@ -81,8 +81,9 @@ module Gaku
 
     def set_countries_and_states
       @countries = Country.all
-      @default_country = Country.where(name: Preset.address('country')).first
-      @default_state = State.where(name_ascii: Preset.address('state')).first
+
+      @default_country = Preset.country
+      @default_state = Preset.state
       @states = @default_country.states if @default_country
     end
 

data/app/controllers/gaku/{states_controller.rb → states_list_controller.rb}

@@ -1,12 +1,16 @@
 module Gaku
-  class StatesController < GakuController
+  class StatesListController < GakuController
     respond_to :js, :json
 
     def index
       if params[:country_id]
         @country = Country.find(params[:country_id])
         @states = State.where(country_iso: @country.iso)
-                       .order('name asc')
+        if params[:state_id]
+          @state = State.find(params[:state_id])
+        else
+          @state = Preset.state
+        end
       else
         @states = State.all
       end

data/app/views/gaku/addresses/_form_fields.html.slim

@@ -4,11 +4,10 @@
 
 .row
   .col-md-3
-    = f.select :country_id, options_from_collection_for_select(@countries, :id, :name, (f.object.country_id || @default_country.try(:id))) , { prompt: t(:'address.choose_country') }, { id: "country_dropdown", label: t(:'address.country') }
+    = f.select :country_id, options_from_collection_for_select(@countries, :id, :i18n_name, (f.object.country_id || @default_country.try(:id))) , { prompt: t(:'address.choose_country') }, { id: "country_dropdown", label: t(:'address.country') }
   .col-md-3
     #state-dropdown
-      = f.select :state_id, options_from_collection_for_select(state_load(f.object), :id, :name, (f.object.state_id || @default_state.try(:id))), { prompt: t(:'address.state.choose') }, { class: 'form-control', disabled: disabled?(f.object), label: t(:'address.state') }
-
+      = f.select :state_id, options_from_collection_for_select(state_load(f.object), :id, :i18n_name, (f.object.state_id || @default_state.try(:id))), { prompt: t(:'address.state.choose') }, { class: 'form-control', disabled: disabled?(f.object), label: t(:'address.state.singular') }
   .col-md-3
     = f.text_field :zipcode, label: t(:'address.zipcode')
 

data/app/views/gaku/addresses/edit.js.erb

@@ -1,4 +1,4 @@
 $('#modal-dialogs').html('<%= j render("modal", {address: @address}) %>');
 $('#edit-address-modal').modal('show');
 $('.remote-form').enableValidations();
-load_states();
+load_edit_states(<%= @address.state_id %>);

data/app/views/gaku/home/index.html.slim

@@ -1,10 +1,8 @@
-/- content_for :title, translate("comname")
 - if user_signed_in?
   = render partial: 'user_info'
   = render partial: 'user_menu'
 - else
-  | 下記のリンクからログインを行ってください。
-  #{link_to t("devise.sign_in"), new_user_session_path}
+  = link_to t(:"devise.sign_in"), new_user_session_path
 
 .panel.panel-default
  .panel-body

data/app/views/gaku/states_list/_no_states_select.html.slim

@@ -0,0 +1,4 @@
+= fields_for :address do |a|
+  = a.label :state_id,  t(:'address.state.singular')
+  = a.select :state_id, options_from_collection_for_select(states, :id, :i18n_name), { prompt: t(:'address.state.choose') }, disabled: true, class: 'form-control'
+

data/app/views/gaku/states_list/_states_select.html.slim

@@ -0,0 +1,3 @@
+= fields_for :address do |a|
+  = a.label :state_id,  t(:'address.state.singular')
+  = a.select :state_id, options_from_collection_for_select(states, :id, :i18n_name, state.try(:id)), { prompt: t(:'address.state.choose') }, { class: 'form-control' }

data/app/views/gaku/states_list/index.js.erb

@@ -0,0 +1,5 @@
+if(<%= @states.count %> > 0 ) {
+  $('#state-dropdown').html("<%=j render 'states_select', states: @states, state: @state %>")
+} else {
+  $('#state-dropdown').html("<%=j render 'no_states_select', states: @states %>")
+}

data/config/routes.rb

@@ -56,6 +56,8 @@ Gaku::Core::Engine.routes.draw do
     post :create_admin,        to: 'devise/registrations#create_admin'
   end
 
+  resources :states_list, only: :index
+
   resources :extracurricular_activities, concerns: %i( pagination enrollmentable )
 
   resources :class_groups, concerns: %i( notes student_selection pagination semesterable) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaku_frontend
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Rei Kagetsuki
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gaku_core
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: gaku_testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -101,16 +101,16 @@ dependencies:
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
@@ -229,14 +229,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -426,7 +426,7 @@ files:
 - app/controllers/gaku/realtime_controller.rb
 - app/controllers/gaku/search_controller.rb
 - app/controllers/gaku/semester_connectors_controller.rb
-- app/controllers/gaku/states_controller.rb
+- app/controllers/gaku/states_list_controller.rb
 - app/controllers/gaku/student_selection_controller.rb
 - app/controllers/gaku/students/badges_controller.rb
 - app/controllers/gaku/students/class_group_enrollments_controller.rb
@@ -767,9 +767,9 @@ files:
 - app/views/gaku/shared/student_chooser/_modal.html.slim
 - app/views/gaku/shared/student_selection/_chooser.html.slim
 - app/views/gaku/shared/student_selection/_modal.html.slim
-- app/views/gaku/states/_no_states_select.html.slim
-- app/views/gaku/states/_states_select.html.slim
-- app/views/gaku/states/index.js.erb
+- app/views/gaku/states_list/_no_states_select.html.slim
+- app/views/gaku/states_list/_states_select.html.slim
+- app/views/gaku/states_list/index.js.erb
 - app/views/gaku/student_selection/_selected_student.html.slim
 - app/views/gaku/student_selection/add.js.erb
 - app/views/gaku/student_selection/clear.js.erb

data/app/views/gaku/states/_no_states_select.html.slim

@@ -1 +0,0 @@
-= collection_select(:address, :state_id,  states,  :id, :name, {prompt: t(:'address.state.choose') }, disabled: true, class: 'span12 form-control')

data/app/views/gaku/states/_states_select.html.slim

@@ -1 +0,0 @@
-= collection_select(:address, :state_id,  states,  :id, :name, {prompt: t(:'address.state.choose') }, class: 'span12 form-control')

data/app/views/gaku/states/index.js.erb

@@ -1,5 +0,0 @@
-if(<%= @states.count %> > 0 ){
-  $('#state-dropdown .controls').html("<%=j render 'states_select', states: @states%>")
-}else{
-  $('#state-dropdown .controls').html("<%=j render 'no_states_select', states: @states%>")
-}