gaku_admin 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfc13aa94367abe90c9dff56822a0bb3679a700b
-  data.tar.gz: 5d2470d7ac12e331a6ee8b809c725ed22d6dfa0c
+  metadata.gz: 68a91086d9239dce0c9fc7b7d447a8a0efe811a0
+  data.tar.gz: a187e85465e95f439cb4d59e62d0f9f1f64511ae
 SHA512:
-  metadata.gz: 1b504e45510d0c2d47759e15767b66a40c27af1c77a37252b0a0587adbb8b442abaa035a25087067d382d5c9a994933f8b27ccfed03070af5d36adf274da5373
-  data.tar.gz: 38480571f8f6fc25119ad423470d35e9f91b7de015d0c0ca72dde9175b017b21486ac5f6f7d88e01d2f8ef3e62956c316731afa8d84baaeef287e945cd83aeb7
+  metadata.gz: 839e571029c93ba58e9b6dff85ee06bf903301149b84675940db5fe0d131f38baa45b544f036d0e3e04c50bed4172a2fe90ca5ff2fb2748308288b598d91b52e
+  data.tar.gz: 143effde0a02eb8f387f06d3ea49b5c32f4087e1d21c4d62b70ad32219211a3746fe554746ca08a781f085df88e62aa4f24dcddf164cc2d7cd9b3acc287c0600

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

@@ -26,12 +26,23 @@ $.fn.datepicker_i18n = ->
 
 $.fn.datepicker.defaults.format = "yyyy-mm-dd"
 
+window.load_preset_states = (preset_id)->
+  countryCode = $("#country_dropdown option:selected").val()
+  if countryCode
+    $.ajax
+      type: 'get'
+      url: '/admin/presets/states_list'
+      dataType: 'script'
+      data:
+        country_id: countryCode
+        preset_id: preset_id
+
 window.load_states = ->
   countryCode = $("#country_dropdown option:selected").val()
   if countryCode
     $.ajax
       type: 'get'
-      url: '/states'
+      url: '/admin/states_list'
       dataType: 'script'
       data:
         country_id: countryCode

data/app/controllers/gaku/admin/campuses/addresses_controller.rb

@@ -13,6 +13,8 @@ module Gaku
     end
 
     def new
+      @default_country = Preset.country
+      @default_state = Preset.state
       @address = Address.new
       respond_with @address
     end

data/app/controllers/gaku/admin/presets_controller.rb

@@ -2,7 +2,7 @@ module Gaku
   class Admin::PresetsController < Admin::BaseController
 
     respond_to :js,            only: %i( index edit update )
-    before_action :set_preset, except: :index
+    before_action :set_preset, except: %i( index states_list )
 
     def index
       @presets = Preset.all
@@ -13,6 +13,8 @@ module Gaku
     def edit
       @per_page_values = [10, 25, 50, 100]
       @countries = Country.all
+      @country = @preset['address']['country'] ? Country.find(@preset['address']['country']) : Country.first
+      @state = @preset['address']['state'] ? State.find(@preset['address']['state']) : nil
     end
 
     def update
@@ -20,6 +22,21 @@ module Gaku
       respond_with @preset, location: [:edit, :admin, @preset]
     end
 
+    def states_list
+      if params[:country_id]
+        @country = Country.find(params[:country_id])
+
+        if params[:preset_id]
+          @preset = Preset.find(params[:preset_id])
+          @state = @preset['address']['state'] ? State.find(@preset['address']['state']) : nil
+        end
+
+        @states = State.where(country_iso: @country.iso)
+      else
+        @states = State.all
+      end
+    end
+
     private
 
     def preset_params

data/app/controllers/gaku/admin/states_list_controller.rb

@@ -0,0 +1,20 @@
+module Gaku
+  module Admin
+    class StatesListController < Admin::BaseController
+
+      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')
+          @state = Preset.state
+        else
+          @states = State.all
+        end
+
+      end
+    end
+  end
+end

data/app/helpers/gaku/shared_helper.rb

@@ -9,12 +9,22 @@ module Gaku
       { t(:'gender.female') => false, t(:'gender.male') => true }
     end
 
-    def state_load(object)
-      object.country.nil? ? Gaku::State.none : object.country.states
+    def state_load(country_preset)
+      country = Gaku::Country.find_by(iso: country_preset)
+      if country
+        country.states
+      else
+        Gaku::State.none
+      end
     end
 
-    def disabled?(object)
-      object.new_record? || object.country.states.blank?
+    def disabled?(country_preset)
+      country = Gaku::Country.find_by(iso: country_preset)
+      if country
+        country.states_required
+      else
+        true
+      end
     end
 
     def render_flash

data/app/views/gaku/admin/campuses/addresses/_addresses.html.slim

@@ -13,8 +13,8 @@
           tr
             = th t(:'address.title')
             = th t(:'address.country')
+            = th t(:'address.state.singular')
             = th t(:'address.zipcode')
-            = th t(:'address.state')
             = th t(:'address.city')
             = th t(:'address.address1')
             = th t(:'address.address2')

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

@@ -3,23 +3,22 @@
     = f.text_field :title, label: t(:'address.title')
 
 .row
-  .col-md-3
-    = f.select :country_id, options_from_collection_for_select(@countries, :id, :name) , { prompt: t(:'address.choose_country'), selected: f.object.country_id || Gaku::Preset.address('country') }, id: "country_dropdown", label: t(:'address.country')
-  .col-md-3
+  .col-md-4
+    = 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-4
     #state-dropdown
-      = f.collection_select :state_id, state_load(f.object), :id, :name, { prompt: t(:'address.state.choose')} , disabled: disabled?(f.object), label: t(:'address.state')
-
-  .col-md-3
+      = 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-4
+    = f.object.state_id || @default_state.try(:id)
+    / = f.object.to_json
     = f.text_field :zipcode, label: t(:'address.zipcode')
-  .col-md-3
-    button.col-md-12.btn.btn-primary = t(:'address.search')
 
 .row
-  .col-md-3
+  .col-md-4
     = f.text_field :city, value: f.object.city ||  Gaku::Preset.address('city'), label: t(:'address.city')
-  .col-md-3
+  .col-md-4
     = f.text_field :address1, label: t(:'address.address1')
-  .col-md-3
+  .col-md-4
     = f.text_field :address2, label: t(:'address.address2')
 
 javascript:

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

@@ -1,5 +1,6 @@
 .row
-  .col-md-2
-    .panel-group#accordion
+  .panel-group#accordion
+    .col-md-2
       = render 'gaku/shared/menu/admin_menu'
-  .col-md-10#ajax-load
+
+  .col-md-10.pull-right#ajax-load

data/app/views/gaku/admin/presets/_address.html.slim

@@ -4,12 +4,14 @@
       .col-md-4
         = f.fields_for :address do |a|
           = a.label t(:'preset.address.country')
-          = a.select :country, @countries, {selected: @preset['address']['country'], prompt: t(:'address.choose_country')}, { class: 'form-control' }
+          = a.select :country, options_from_collection_for_select(@countries, :id, :i18n_name, @country.try(:id)) , { prompt: t(:'address.choose_country') }, { id: "country_dropdown", class: 'form-control', label: t(:'address.country') }
 
       .col-md-4
         = f.fields_for :address do |a|
           = a.label t(:'preset.address.state')
-          = a.text_field :state, value: @preset['address']['state'], class: 'form-control'
+          #state-dropdown
+            = a.select :state, options_from_collection_for_select(state_load(@preset['address']['country']), :id, :i18n_name, @state.try(:id)), { prompt: t(:'address.state.choose') }, { class: 'form-control', disabled: disabled?(a.object), label: t(:'address.state') }
+
 
       .col-md-4
         = f.fields_for :address do |a|

data/app/views/gaku/admin/presets/_no_states_select.html.slim

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

data/app/views/gaku/admin/presets/_states_select.html.slim

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

data/app/views/gaku/admin/presets/edit.js.erb

@@ -1 +1,7 @@
-$('#ajax-load').html('<%=j render "tabs" %>')
+$('#ajax-load').html('<%=j render "tabs" %>');
+
+$('body').on('change', '#country_dropdown', function() {
+  return load_preset_states(<%= @preset.id %>);
+});
+
+load_preset_states(<%= @preset.id %>);

data/app/views/gaku/admin/presets/states_list.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/app/views/gaku/admin/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/admin/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/admin/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

@@ -17,11 +17,11 @@ Gaku::Core::Engine.routes.draw  do
     end
   end
 
-  resources :states, only: :index
-
   namespace :admin do
     root to: 'home#index'
 
+    resources :states_list, only: :index
+
     get 'school_details',          to: 'schools#show_master'
     get 'school_details/edit',     to: 'schools#edit_master'
     patch 'school_details/update', to: 'schools#update_master'
@@ -71,7 +71,9 @@ Gaku::Core::Engine.routes.draw  do
       resources :semesters, controller: 'school_years/semesters', except: %i( show )
     end
 
-    resources :presets
+    resources :presets do
+      get :states_list, on: :collection
+    end
 
   end
 end

data/lib/tasks/admin_user.rake

@@ -91,10 +91,11 @@ def create_admin_user
     say "\nWARNING: There is already a user with the username: #{username}, so no account changes were made.  If you wish to create an additional admin user, please run rake gaku:generate_admin again with a different username.\n\n"
   else
     say "Creating user..."
-    creator = Gaku::UserCreator.new(attributes).save
+    creator = Gaku::UserCreator.new(attributes)
+    creator.save
     admin = creator.get_user
     # create an admin role and and assign the admin user to that role
-    role = Gaku::Role.find_or_create_by_name 'Admin'
+    role = Gaku::Role.where(name: 'Admin').first_or_initialize
     admin.roles << role
     if admin.save
       say "User Created"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaku_admin
 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
@@ -364,11 +364,11 @@ files:
 - app/controllers/gaku/admin/simple_grade_types_controller.rb
 - app/controllers/gaku/admin/specialties_controller.rb
 - app/controllers/gaku/admin/states_controller.rb
+- app/controllers/gaku/admin/states_list_controller.rb
 - app/controllers/gaku/admin/student_review_categories_controller.rb
 - app/controllers/gaku/admin/system_tools_controller.rb
 - app/controllers/gaku/admin/templates_controller.rb
 - app/controllers/gaku/admin/users_controller.rb
-- app/controllers/gaku/states_controller.rb
 - app/helpers/gaku/admin_helper.rb
 - app/helpers/gaku/presets_helper.rb
 - app/helpers/gaku/shared_helper.rb
@@ -534,15 +534,18 @@ files:
 - app/views/gaku/admin/presets/_grading.html.slim
 - app/views/gaku/admin/presets/_locale.html.slim
 - app/views/gaku/admin/presets/_names_order.html.slim
+- app/views/gaku/admin/presets/_no_states_select.html.slim
 - app/views/gaku/admin/presets/_pagination.html.slim
 - app/views/gaku/admin/presets/_person.html.slim
 - app/views/gaku/admin/presets/_preset.html.slim
 - app/views/gaku/admin/presets/_presets.html.slim
+- app/views/gaku/admin/presets/_states_select.html.slim
 - app/views/gaku/admin/presets/_student.html.slim
 - app/views/gaku/admin/presets/_tabs.html.slim
 - app/views/gaku/admin/presets/edit.html.slim
 - app/views/gaku/admin/presets/edit.js.erb
 - app/views/gaku/admin/presets/index.js.erb
+- app/views/gaku/admin/presets/states_list.js.erb
 - app/views/gaku/admin/presets/update.js.erb
 - app/views/gaku/admin/roles/_fields.html.slim
 - app/views/gaku/admin/roles/_form.html.slim
@@ -666,6 +669,9 @@ files:
 - app/views/gaku/admin/states/index.js.erb
 - app/views/gaku/admin/states/new.js.erb
 - app/views/gaku/admin/states/update.js.erb
+- app/views/gaku/admin/states_list/_no_states_select.html.slim
+- app/views/gaku/admin/states_list/_states_select.html.slim
+- app/views/gaku/admin/states_list/index.js.erb
 - app/views/gaku/admin/student_review_categories/_form.html.slim
 - app/views/gaku/admin/student_review_categories/_form_fields.html.slim
 - app/views/gaku/admin/student_review_categories/_modal.html.slim
@@ -724,9 +730,6 @@ files:
 - app/views/gaku/shared/menu/_admin_menu.html.erb
 - app/views/gaku/shared/multi_error.js.erb
 - app/views/gaku/shared/notice.js.erb
-- app/views/gaku/states/_no_states_select.html.slim
-- app/views/gaku/states/_states_select.html.slim
-- app/views/gaku/states/index.js.erb
 - config/initializers/wrap_parameters.rb
 - config/routes.rb
 - lib/gaku/admin.rb

data/app/controllers/gaku/states_controller.rb

@@ -1,19 +0,0 @@
-module Gaku
-  class StatesController < CoreController
-
-    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')
-      else
-        @states = State.all
-      end
-
-      respond_with @states
-    end
-
-  end
-end

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')

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')

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%>")
-}