db/migrate/20090726200034_add_state_id_index_to_campus.rb @@ -21,3 +21,4 @@ nbproject/ public/profile_pictures *~ .project +config/initializers/cmt_config.rb \ No newline at end of file .gitignore @@ -365,6 +365,10 @@ class ApplicationController < ActionController::Base request.format = :facebook if iphone_request? end + def default_country + @default_country ||= (Country.find(:first, :conditions => { _(:country, :country) => Cmt::CONFIG[:default_country] }) || Country.new) + end + private # Ensures that the _person_ is involved in the 'No Ministry' ministry # BUG 1857 app/controllers/application_controller.rb @@ -344,8 +344,8 @@ class PeopleController < ApplicationController current_address_states = get_states @person.current_address.try(:state).try(:country_id) permanent_address_states = get_states @person.permanent_address.try(:state).try(:country_id) - current_address_country_id = @person.current_address.try(:state).try(:country_id) - permanent_address_country_id = @person.permanent_address.try(:state).try(:country_id) + current_address_country_id = @person.current_address.try(:state).try(:country_id) || default_country.id + permanent_address_country_id = @person.permanent_address.try(:state).try(:country_id) || default_country.id get_people_responsible_for get_possible_responsible_people @@ -702,7 +702,7 @@ class PeopleController < ApplicationController @primary_campus_involvement = @person.primary_campus_involvement || CampusInvolvement.new # If the Country is set in config, don't filter by states but get campuses from the country if Cmt::CONFIG[:campus_scope_country] && - (c = Country.find :first, :conditions => { _(:country, :country) => Cmt::CONFIG[:campus_scope_country] }) + (c = Country.find(:first, :conditions => { _(:country, :country) => Cmt::CONFIG[:campus_scope_country] })) @no_campus_scope = true @campus_country = c @campuses = @campus_country.states.collect{|s| s.campuses}.flatten @@ -753,13 +753,15 @@ class PeopleController < ApplicationController @sql += ' ORDER BY ' + @order end - def get_states - country = Country.find params[:primary_campus_country_id] - @campus_states = country.try(:states) || [] - end - - def get_states(country_id) - State.find_all_by_country_id(country_id) + def get_states(country_id = nil) + if country_id + states = State.find_all_by_country_id(country_id) + else + country = Country.find(params[:primary_campus_country_id]) if params[:primary_campus_country_id] + states = @campus_states = country.try(:states) + end + states = default_country.states if states.blank? + states || [] end def set_use_address2 app/controllers/people_controller.rb @@ -13,14 +13,12 @@ </div> </div> --> -<%- help_block do -%> <h3>Customization</h3> <p>You can edit a number of things from this page. Click on each of the category headings to open that category of customization. You can view help on each section. </p> -<%- end -%> <div id="customizebody" class="accordion"> app/views/customize/_customize.html.erb @@ -1,10 +1,5 @@ <td id ="current_address_state_dropdown"> <%= - collection_select :current_address, - :state_id, - states, - :id, - :name, - { :prompt => true } + collection_select(:current_address, :state_id, states, :id, :name, { :prompt => true }) %> </td> \ No newline at end of file app/views/people/_current_address_state_dropdown.html.erb @@ -27,7 +27,7 @@ <%= render :partial => 'current_address', :locals => { :dorms => @dorms, - :states => @current_address_states, + :states => current_address_states, :current_address_country_id => current_address_country_id, :countries => countries } %> app/views/people/_edit.html.erb @@ -71,6 +71,10 @@ Rails::Initializer.run do |config| # All files from config/locales/*.rb,yml are added automatically. # config.i18n.load_path << Dir[File.join(RAILS_ROOT, 'my', 'locales', '*.{rb,yml}')] # config.i18n.default_locale = :de + + if File.exists?(File.join(RAILS_ROOT, 'config', 'initializers', 'cmt_config.example')) && !File.exists?(File.join(RAILS_ROOT, 'config', 'initializers', 'cmt_config.rb')) + FileUtils.cp(File.join(RAILS_ROOT, 'config', 'initializers', 'cmt_config.example'), File.join(RAILS_ROOT, 'config', 'initializers', 'cmt_config.rb')) + end end config/environment.rb @@ -29,6 +29,8 @@ module Cmt # campuses from this country are displayed # Set to nil(:campus_scope_country => nil) to disable. :campus_scope_country => 'Canada', + + :default_country => 'Canada', # Disable second address line :disable_address2 => false, config/initializers/cmt_config.example @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090613034002) do +ActiveRecord::Schema.define(:version => 20090726200034) do create_table "addresses", :force => true do |t| t.integer "person_id" @@ -73,6 +73,8 @@ ActiveRecord::Schema.define(:version => 20090613034002) do end add_index "campuses", ["county"], :name => "index_campuses_on_county" + add_index "campuses", ["name"], :name => "index_campuses_on_name" + add_index "campuses", ["state_id"], :name => "index_campuses_on_state_id" create_table "columns", :force => true do |t| t.string "title" db/schema.rb 96c0759b2e91725e4a3277a80c7b8ffb8c1ac1c3 Josh Starcher josh@josh-starchers-mac-pro.local http://github.com/twinge/ministry-tracker/commit/02bc53f8945399d0fe0b1c341ccf040d4921b606 02bc53f8945399d0fe0b1c341ccf040d4921b606 2009-07-26T13:45:59-07:00 2009-07-26T13:45:59-07:00 fix editing a profile 3339c575ffd52265d3fe75c187bbf7cb27028739 Josh Starcher josh@josh-starchers-mac-pro.local