Merge branch 'master' into fix-load-paths

Author: CloCkWeRX

app/assets/javascripts/crm_select2.js.coffee

@@ -15,23 +15,26 @@
         $(this).select2
           'width':'resolve'
           placeholder: $(this).attr("placeholder")
+          allowClear: true
           ajax:
             url: $(this).data("url")
             dataType: 'json'
       else
         $(this).select2
           'width':'resolve'
           placeholder: $(this).attr("placeholder")
+          allowClear: true
 
       if $(this).prop("disabled") == true
         $(this).next('.select2-container').disable()
-        $(this).next('.select2-container').hide()    
+        $(this).next('.select2-container').hide()
 
     $(".select2_tag").not(".select2-container, .select2-offscreen").each ->
       $(this).select2
         'width':'resolve'
         placeholder: $(this).data("placeholder")
         multiple: $(this).data("multiple")
+        allowClear: true
 
   $(document).ready ->
     crm.make_select2()

app/views/shared/_address.html.haml

@@ -41,4 +41,4 @@
           = address_field(a, :zipcode, "width:80px;")
         %td= spacer
         %td
-          = a.country_select(:country, priority_countries: priority_countries, include_blank: "", :"data-placeholder" => t(:select_a_country), style: "width:150px; margin-top:6px", class: 'select2')
+          = a.country_select(:country, {priority_countries: priority_countries, include_blank: true}, {data: { placeholder: t(:select_a_country)}, class: 'select2'})

config/initializers/custom_field_ransack_translations.rb

@@ -7,7 +7,7 @@
 #------------------------------------------------------------------------------
 # Load field names for custom fields, for Ransack search
 require 'setting'
-if Setting.database_and_table_exists?
+if Setting.database_and_table_exists? && ActiveRecord::Base.connection.table_exists?(:custom_fields)
   Rails.application.config.after_initialize do
     I18n.backend.load_translations
 

config/settings.default.yml

@@ -192,7 +192,8 @@
 #------------------------------------------------------------------------------
 # Specify which countries (if any) should appear at the top of country pickers
 # priority_countries:
-#  - Burkina Faso
+#  - AU
+#  - BF
 
 # Main and Admin Tabs
 #------------------------------------------------------------------------------