fat_free_crm 0.21.0 → 0.22.1

data/app/models/observers/entity_observer.rb

@@ -19,7 +19,7 @@ class EntityObserver < ActiveRecord::Observer
   private
 
   def send_notification_to_assignee(item)
-    UserMailer.assigned_entity_notification(item, current_user).deliver_now if item.assignee.present? && current_user.present? && can_send_email?
+    UserMailer.assigned_entity_notification(item, current_user).deliver_later if item.assignee.present? && current_user.present? && can_send_email?
   end
 
   # Need to have a host set before email can be sent

data/app/models/polymorphic/comment.rb

@@ -54,7 +54,7 @@ class Comment < ActiveRecord::Base
   def notify_subscribers
     commentable.subscribed_users.reject { |user_id| user_id == user.id }.each do |subscriber_id|
       if subscriber = User.find_by_id(subscriber_id)
-        SubscriptionMailer.comment_notification(subscriber, self).deliver_now
+        SubscriptionMailer.comment_notification(subscriber, self).deliver_later
       end
     end
   end

data/app/models/setting.rb

@@ -58,13 +58,11 @@ class Setting < ActiveRecord::Base
       return cache[name] if cache.key?(name)
 
       # Check database
-      if database_and_table_exists?
-        if setting = find_by_name(name.to_s)
-          return cache[name] = setting.value unless setting.value.nil?
-        end
+      if database_and_table_exists? && (setting = find_by_name(name.to_s))&.value.present?
+        return cache[name] = setting.value
       end
       # Check YAML settings
-      return cache[name] = yaml_settings[name] if yaml_settings.key?(name)
+      cache[name] = yaml_settings[name] if yaml_settings.key?(name)
     end
 
     # Set setting value
@@ -73,6 +71,7 @@ class Setting < ActiveRecord::Base
       raise ArgumentError, "name cannot be blank" if name.blank?
 
       return nil unless database_and_table_exists?
+
       setting = find_by_name(name.to_s) || new(name: name.to_s)
       setting.value = value
       setting.save

data/app/models/users/user.rb

@@ -61,7 +61,7 @@ class User < ActiveRecord::Base
   has_many :opportunities
   has_many :assigned_opportunities, class_name: 'Opportunity', foreign_key: 'assigned_to'
   has_many :permissions, dependent: :destroy
-  has_many :preferences, dependent: :destroy
+  has_many :preferences, class_name: 'Preference', dependent: :destroy
   has_many :lists
   has_and_belongs_to_many :groups
 

data/app/views/accounts/_contact_info.html.haml

@@ -1,5 +1,5 @@
 - edit ||= false
-- collapsed = (@account.errors.empty? && session[:account_contact].nil?)
+- collapsed = session[:account_contact].nil?
 = subtitle :account_contact, collapsed, t(:contact_info)
 .section
   %small#account_contact_intro{ hidden_if(!collapsed) }

data/app/views/accounts/_top_section.html.haml

@@ -2,9 +2,9 @@
   .section
     %table
       %tr
-        %td(colspan="5")
+        %td{class: (@account.errors['name'].present? ? 'fieldWithErrors' : nil)}(colspan="5")
           .label.top.req #{t :name}:
-          = f.text_field :name, autofocus: true, style: "width:500px"
+          = f.text_field :name, autofocus: true, style: "width:500px", required: "required"
       %tr
         %td
           .label #{t :assigned_to}:
@@ -12,7 +12,7 @@
         %td= spacer
         %td
           .label #{t :category}:
-          = f.select :category, Setting.unroll(:account_category), { selected: (@account.category || "other").to_sym, include_blank: t(:other) }, { style: "width:160px", class: 'select2' }
+          = f.select :category, Setting.unroll(:account_category), { selected: (@account.category || "other").to_sym, include_blank: t(:other) }, { style: "width:160px", class: 'select2', placeholder: t(:other) }
         %td= spacer
         %td
           .label #{t :rating}:

data/app/views/accounts/show.js.haml

@@ -1,5 +1,5 @@
 - entity_name = controller.controller_name.singularize.underscore #account
 - @entity = instance_variable_get("@#{entity_name}")
 
-$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
+$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show", formats: [:html], entity_name => @entity) }');
 = raw generate_js_for_popups(@entity, :tasks, :contacts, :opportunities)

data/app/views/accounts/update.js.haml

@@ -7,6 +7,7 @@
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{j @entity.name}');
     = refresh_sidebar(:show)
+    $('#summary').html('#{ j (render partial: "#{entity_name.pluralize}/sidebar_show", entity_name => @entity) }');
   - else
     $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
     $('##{id}').effect("highlight", { duration:1500 });

data/app/views/admin/custom_fields/_check_boxes_field.html.haml

@@ -1,6 +1,9 @@
 %div
   .label.top.req
     = "Select Options (pipe separated):"
-= f.text_field :collection_string, class: 'field_collection_string', size: 78
+= f.text_field :collection_string, class: 'field_collection_string', size: 78, placeholder: "Option 1|Option 2|Option 3"
 
 = render partial: 'admin/custom_fields/base_field', locals: {f: f}
+
+- if f.object.new_record?
+  .info2 After saving, you must restart all instances of the Rails server to apply column serialization.

data/app/views/admin/custom_fields/_date_pair_field.html.haml

@@ -1,5 +1,5 @@
 - field1 = f.object || CustomFieldPair.new
-- field2 = f.object.respond_to?(:paired_with) ? field1.paired_with : CustomFieldPair.new
+- field2 = (field1.pair || CustomFieldPair.new)
 
 %table{class: :pairs}
   = fields_for("pair[0]", field1) do |first|

data/app/views/campaigns/_top_section.html.haml

@@ -2,9 +2,9 @@
   .section
     %table
       %tr
-        %td(colspan="5")
+        %td{class: (@campaign.errors['name'].present? ? 'fieldWithErrors' : nil)}(colspan="5")
           .label.top.req #{t :name}:
-          = f.text_field :name, autofocus: true, style: "width:500px"
+          = f.text_field :name, autofocus: true, style: "width:500px", required: "required"
       %tr
         %td
           .label #{t :start_date}:

data/app/views/campaigns/show.js.haml

@@ -1,5 +1,5 @@
 - entity_name = controller.controller_name.singularize.underscore #account
 - @entity = instance_variable_get("@#{entity_name}")
 
-$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
+$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show", formats: [:html], entity_name => @entity) }');
 = raw generate_js_for_popups(@entity, :tasks, :leads, :opportunities)

data/app/views/campaigns/update.js.haml

@@ -7,6 +7,7 @@
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
     = refresh_sidebar(:show)
+    $('#summary').html('#{ j (render partial: "#{entity_name.pluralize}/sidebar_show", entity_name => @entity) }');
   - else
     $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
     $('##{id}').effect("highlight", { duration:1500 });

data/app/views/contacts/_top_section.html.haml

@@ -3,13 +3,13 @@
   .section
     %table
       %tr
-        %td
-          .label.top.req{ class: "#{Setting.require_first_names ? 'req' : nil}" } #{t :first_name}:
-          = f.text_field :first_name, autofocus: true
+        %td{class: (@contact.errors['first_name'].present? ? 'fieldWithErrors' : nil)}
+          .label.top{ class: "#{Setting.require_first_names ? 'req' : nil}" } #{t :first_name}:
+          = f.text_field :first_name, autofocus: true, required: (Setting.require_first_names ? "required" : nil)
         %td= spacer
-        %td
+        %td{class: (@contact.errors['last_name'].present? ? 'fieldWithErrors' : nil)}
           .label.top{ class: "#{Setting.require_last_names ? 'req' : nil}" } #{t :last_name}:
-          = f.text_field :last_name
+          = f.text_field :last_name, required: (Setting.require_last_names ? "required" : nil)
       %tr
         %td
           .label #{t :email}:

data/app/views/contacts/show.js.haml

@@ -1,5 +1,4 @@
-- entity_name = controller.controller_name.singularize.underscore #account
+- entity_name = controller.controller_name.singularize.underscore
 - @entity = instance_variable_get("@#{entity_name}")
-
-$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
+$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show", formats: [:html], entity_name => @entity) }');
 = raw generate_js_for_popups(@entity, :tasks, :opportunities)

data/app/views/contacts/update.js.haml

@@ -8,6 +8,7 @@
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{h @entity.full_name}');
     = refresh_sidebar(:show)
+    $('#summary').html('#{ j (render partial: "#{entity_name.pluralize}/sidebar_show", entity_name => @entity) }');
   - else
     $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
     $('##{id}').effect("highlight", { duration:1500 });

data/app/views/devise/sessions/new.html.haml

@@ -23,10 +23,9 @@
       .label= t(:password)
       = f.input_field :password
 
-    %div(style="margin-left:12px")
+    .section
       = f.input :remember_me, as: :boolean, inline_label: t('remember_me')
-    %br
-    .buttonbar
-      = f.submit t(:login)
-      = t(:or)
+      = f.submit t(:login), class: 'btn btn-primary'
+
+    .section
       = link_to t(:forgot_password) + '?', new_password_path(resource_name)

data/app/views/fields/_group.html.haml

@@ -1,6 +1,9 @@
 - if field_group.name != 'custom_fields'
-  -# start a new section
-  - collapsed = session[field_group.key].nil?
+  - # Ensure field groups containing validation errors are expanded
+  - required_field_names = field_group.fields.select(&:required?).map(&:name)
+  - fields_with_errors = f.object.errors.map{|e| e.attribute.to_s}
+  - force_open = (required_field_names & fields_with_errors).any?
+  - collapsed = session[field_group.key].nil? && !force_open
   %div{ id: "#{field_group.key}_container", :"data-tag" => field_group.tag.try(:name) }
     = subtitle field_group.key, collapsed, t(field_group.name, default: field_group.label)
     .section

data/app/views/fields/_group_table.html.haml

@@ -2,12 +2,11 @@
   - field_group.fields.without_pairs.in_groups_of(2, false) do |group|
     %tr
       - group.each_with_index do |field, i|
-        %td
+        %td{class: (f.object.errors[field.name].present? ? 'fieldWithErrors' : nil)}
           - if field.hint.present?
             = image_tag "info_tiny.png", title: field.hint, class: "tooltip-icon"
-          - if field.as == 'check_boxes'
-            - value = f.object.send(field.name)
-            - checked = YAML.load(value.to_s)
-          = f.input field.name, field.input_options.merge(checked: checked)
+          .label.top{class: (field.required? ? 'req': nil)}
+            = "#{field.label}:"
+          = f.input_field field.name, field.input_options
         - if i == 0
           %td= spacer

data/app/views/fields/_group_view.html.haml

@@ -4,7 +4,10 @@
     %tr
       - group.each do |field|
         = col(field.label, (i == groups.size - 1) ? :last : nil) do
-          = field.render_value(entity)
+          - if field.as == "text"
+            = simple_format(field.render_value(entity))
+          - else
+            = field.render_value(entity)
         - if group.size == 1
           %th.last
           %td.last

data/app/views/fields/_sidebar_show.html.haml

@@ -1,9 +1,6 @@
 - asset.field_groups.each do |field_group|
-  - fg = field_group.fields.without_pairs
-  - if fg.select{|f| asset.send(f.name).present? }.any?
-    %div
-      - unless field_group.name == 'custom_fields'
-        .caption #{field_group.label_i18n}
-      - fg.each do |field|
-        - if (value = field.render_value(asset)).present?
-          == #{field.label}:<br /> <b>#{truncate(value, length: 35)}</b><br />
+  - fields = field_group.fields.without_pairs
+  - if fields.select{|f| asset.send(f.name).present? }.any?
+    - unless field_group.name == 'custom_fields'
+      .caption #{field_group.label_i18n}
+    = render("fields/group_view", fields: fields, entity: asset) unless fields.nil?

data/app/views/fields/group.js.erb

@@ -1,3 +1,5 @@
 <%= simple_fields_for(@asset) do |f| %>
-  $('#field_groups').append('<%= j render(partial: 'fields/group', locals: {f: f, field_group: @field_group, fields: @field_group.fields}) %>')
+  <% @field_groups.each do |field_group| %>
+    $('#field_groups').append('<%= j render(partial: 'fields/group', locals: {f: f, field_group: field_group, fields: field_group.fields}) %>')
+  <% end %>
 <% end %>

data/app/views/layouts/application.html.haml

@@ -42,7 +42,7 @@
       = render "layouts/footer"
 
     %script{type: "text/javascript"}
-      = "crm.base_url = '#{Setting.base_url}';" unless Setting.base_url.blank?
+      = "crm.base_url = '#{h Setting.base_url}';".html_safe unless Setting.base_url.blank?
       = get_browser_timezone_offset
       = content_for :javascript_epilogue
       = hook(:javascript_epilogue, self)

data/app/views/leads/_top_section.html.haml

@@ -3,13 +3,13 @@
   .section
     %table
       %tr
-        %td
+        %td{ class: (@lead.errors['first_name'].present? ? 'fieldWithErrors' : nil)}
           .label.top{ class: "#{Setting.require_first_names ? 'req' : nil}" } #{t :first_name}:
-          = f.text_field :first_name, autofocus: true
+          = f.text_field :first_name, autofocus: true, required: (Setting.require_first_names ? "required" : nil)
         %td= spacer
-        %td
+        %td{ class: (@lead.errors['last_name'].present? ? 'fieldWithErrors' : nil)}
           .label.top{ class: "#{Setting.require_last_names ? 'req' : nil}" } #{t :last_name}:
-          = f.text_field :last_name
+          = f.text_field :last_name, required: (Setting.require_last_names ? "required" : nil)
       %tr
         %td
           .label #{t :email}:

data/app/views/leads/show.js.haml

@@ -1,5 +1,5 @@
 - entity_name = controller.controller_name.singularize.underscore #account
 - @entity = instance_variable_get("@#{entity_name}")
 
-$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
+$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show", formats: [:html], entity_name => @entity) }');
 = raw generate_js_for_popups(@entity, :tasks)

data/app/views/leads/update.js.haml

@@ -7,6 +7,7 @@
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{h @entity.full_name}');
     = refresh_sidebar(:show)
+    $('#summary').html('#{ j (render partial: "#{entity_name.pluralize}/sidebar_show", entity_name => @entity) }');
   - else
     $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
     $('##{id}').effect("highlight", { duration:1500 });

data/app/views/opportunities/_top_section.html.haml

@@ -2,9 +2,9 @@
   .section
     %table
       %tr
-        %td
+        %td{class: (@opportunity.errors['name'].present? ? 'fieldWithErrors' : nil)}
           .label.req.top #{t :name}:
-          = f.text_field :name, autofocus: true, style: "width:325px"
+          = f.text_field :name, autofocus: true, style: "width:325px", required: "required"
         %td= spacer
         %td
           .label.req.top #{t :stage}:

data/app/views/opportunities/show.js.haml

@@ -1,5 +1,5 @@
 - entity_name = controller.controller_name.singularize.underscore #account
 - @entity = instance_variable_get("@#{entity_name}")
 
-$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
+$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show", formats: [:html], entity_name => @entity) }');
 = raw generate_js_for_popups(@entity, :tasks, :contacts)

data/app/views/opportunities/update.js.haml

@@ -7,6 +7,7 @@
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
     = refresh_sidebar(:show)
+    $('#summary').html('#{ j (render partial: "#{entity_name.pluralize}/sidebar_show", entity_name => @entity) }');
   - else
     $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
     $('##{id}').effect("highlight", { duration:1500 });

data/app/views/shared/_add_comment.html.haml

@@ -1,5 +1,5 @@
 - edit ||= false
-- collapsed = @comment_body.nil?  && f.object.errors.empty?
+- collapsed = session[:comment].nil?
 = subtitle :comment, collapsed, t(:comment)
 .section
   %small#comment_intro{ hidden_if(!collapsed) }

data/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'})

data/app/views/tasks/_top_section.html.haml

@@ -3,10 +3,10 @@
     %tr
       %td(colspan="5")
         .label.top.req #{t :name}:
-        = f.text_field :name, autofocus: true, style: "width:500px"
+        = f.text_field :name, autofocus: true, style: "width:500px", required: "required"
     %tr
       %td
-        .label.req #{t :due}:
+        .label #{t :due}:
         - bucket = (params[:bucket].blank? ? @task.bucket : params[:bucket]) || "due_asap"
         - with_time = Setting.task_calendar_with_time
         - if @task.bucket != "specific_time"
@@ -18,11 +18,11 @@
           = f.text_field :calendar, value: f.object.due_at.strftime(fmt), style: "width:160px;", autocomplete: :off, class: (with_time ? 'datetime' : 'date')
       %td= spacer
       %td
-        .label.req #{t :assign_to}:
+        .label #{t :assign_to}:
         = user_select(:task, all_users, current_user)
       %td= spacer
       %td
-        .label.req #{t :category}:
+        .label #{t :category}:
         = f.select :category, @category, { selected: @task.category.blank? ? nil : @task.category.to_sym, include_blank: t(:select_blank) }, { style: "width:160px", class: 'select2' }
 
     - if Setting.background_info && Setting.background_info.include?(:task)

data/bin/bundle

@@ -1,5 +1,111 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-load Gem.bin_path('bundler', 'bundle')
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+  module_function
+
+  def invoked_as_script?
+    File.expand_path($PROGRAM_NAME) == File.expand_path(__FILE__)
+  end
+
+  def env_var_version
+    ENV["BUNDLER_VERSION"]
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # don't want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      bundler_version = a if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+
+      bundler_version = Regexp.last_match(1)
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
+    File.expand_path("../Gemfile", __dir__)
+  end
+
+  def lockfile
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, ".locked")
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+
+    lockfile_contents = File.read(lockfile)
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+
+    Regexp.last_match(1)
+  end
+
+  def bundler_requirement
+    @bundler_requirement ||=
+      env_var_version ||
+      cli_arg_version ||
+      bundler_requirement_for(lockfile_version)
+  end
+
+  def bundler_requirement_for(version)
+    return "#{Gem::Requirement.default}.a" unless version
+
+    bundler_gem_version = Gem::Version.new(version)
+
+    bundler_gem_version.approximate_recommendation
+  end
+
+  def load_bundler!
+    ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+    activate_bundler
+  end
+
+  def activate_bundler
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_requirement
+    end
+    return if gem_error.nil?
+
+    require_error = activation_error_handling do
+      require "bundler/version"
+    end
+    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+
+    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
+    exit 42
+  end
+
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
+  end
+end
+
+m.load_bundler!
+
+load Gem.bin_path("bundler", "bundle") if m.invoked_as_script?

data/bin/rails

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-APP_PATH = File.expand_path('../config/application', __dir__)
-require_relative '../config/boot'
-require 'rails/commands'
+APP_PATH = File.expand_path("../config/application", __dir__)
+require_relative "../config/boot"
+require "rails/commands"

data/bin/rake

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative '../config/boot'
-require 'rake'
+require_relative "../config/boot"
+require "rake"
 Rake.application.run

data/bin/setup

@@ -1,38 +1,35 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'fileutils'
+require "fileutils"
 
 # path to your application root.
-APP_ROOT = File.expand_path('..', __dir__)
+APP_ROOT = File.expand_path("..", __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
 end
 
 FileUtils.chdir APP_ROOT do
-  # This script is a way to setup or update your development environment automatically.
-  # This script is idempotent, so that you can run it at anytime and get an expectable outcome.
+  # This script is a way to set up or update your development environment automatically.
+  # This script is idempotent, so that you can run it at any time and get an expectable outcome.
   # Add necessary setup steps to this file.
 
-  puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
-  system('bundle check') || system!('bundle install')
-
-  # Install JavaScript dependencies
-  # system('bin/yarn')
+  puts "== Installing dependencies =="
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?('config/database.yml')
-  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
+  # unless File.exist?("config/database.yml")
+  #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
   # end
 
   puts "\n== Preparing database =="
-  system! 'bin/rails db:prepare'
+  system! "bin/rails db:prepare"
 
   puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rails log:clear tmp:clear'
+  system! "bin/rails log:clear tmp:clear"
 
   puts "\n== Restarting application server =="
-  system! 'bin/rails restart'
+  system! "bin/rails restart"
 end

data/config/application.rb

@@ -30,11 +30,15 @@ require 'fat_free_crm/gem_ext/rails/engine'
 module FatFreeCRM
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.0
+    config.load_defaults 7.0
 
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
+    # Configuration for the application, engines, and railties goes here.
+    #
+    # These settings can be overridden in specific environments using the files
+    # in config/environments, which are processed later.
+    #
+    # config.time_zone = "Central Time (US & Canada)"
+    # config.eager_load_paths << Rails.root.join("extras")
 
     # Models are organized in sub-directories
     config.autoload_paths += Dir[Rails.root.join("app/models/**")] +
@@ -78,6 +82,7 @@ module FatFreeCRM
     config.active_record.use_yaml_unsafe_load = false
     config.active_record.yaml_column_permitted_classes = [
       ::ActiveRecord::Type::Time::Value,
+      ::ActiveSupport::HashWithIndifferentAccess, # for Field#settings serialization see app/models/fields/field.rb
       ::ActiveSupport::TimeWithZone,
       ::ActiveSupport::TimeZone,
       ::BigDecimal,

data/config/boot.rb

@@ -6,9 +6,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-
-require 'bootsnap/setup'
+require "bundler/setup" # Set up gems listed in the Gemfile.
+require "bootsnap/setup" # Speed up boot time by caching expensive operations.