fat_free_crm 0.22.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 325977901a3011b43c20379a5e03317660a3cd2b702e36ceb7aa255ec0f6ff17
-  data.tar.gz: 6badcc5bfcc41d304fe646a7ea07d1c4fce631b3a60efd08285752fe645e3572
+  metadata.gz: 6ed29c049db6b4f6c31a7c1f5a3a083c1ab92a87d1475ae0808777a8d5c87c9d
+  data.tar.gz: ea1c36a463eafd3c50db26e072a447e74a8d07095a9bd19d0149096f681dc36b
 SHA512:
-  metadata.gz: 58f6a285322ca7ae834bbf2eeeaf0073a2c501f9dd71117b890c9d7a1403dd3b2e5f725e97d2b3814836f854595eb77f322e09a27a94202fb65ca7b28078cd47
-  data.tar.gz: 004b7dadb4c2c77e4863010b59a87dc89500142bc52fe0d90f81e71532d964b287f1bd97365bdd9460898249c0278e0ca389eba9edba1260c3410d0131302d0b
+  metadata.gz: 31bf4871e24767881af295b9b686a62b5c7de6d56894d67f13af38d6721f8728b36d3a0535b05a9b7f14ebbc65d5648ee4dd9924ded07fcf3308fe04835ea428
+  data.tar.gz: 71240615f55f2e0ac3527223d240470d28c3ada768a5f7240c4aea3a1b976ced11e10a2d4335cd733971ba526719f06ff44b7a15ca41127bb63aea7dbc5dd4ab

data/app/assets/javascripts/application.js.erb

@@ -17,6 +17,7 @@
 //= require crm_loginout
 //= require crm_tags
 //= require crm_sortable
+//= require crm_validations
 //= require textarea_autocomplete
 //= require crm_textarea_autocomplete
 //= require crm_select2

data/app/assets/javascripts/crm.js.coffee

@@ -9,8 +9,8 @@
     @[0].toUpperCase() + @.substring(1)
 
   window.crm =
-    EXPANDED: "▼"
-    COLLAPSED: "►"
+    EXPANDED: "▽"
+    COLLAPSED: "▷"
     searchRequest: null
     autocompleter: null
     base_url: ""
@@ -336,7 +336,10 @@
 
       # Country dropdown needs special treatment ;-)
       country = $("#" + from + "_attributes_country").select2("data")
-      $("#" + to + "_attributes_country").select2("data", country, true)
+      if country.length == 1
+        country_dropdown = $("#" + to + "_attributes_country")
+        country_dropdown.val(country[0].id)
+        country_dropdown.trigger('change')
 
 
     #----------------------------------------------------------------------------

data/app/assets/javascripts/crm_select2.js.coffee

@@ -15,6 +15,7 @@
         $(this).select2
           'width':'resolve'
           placeholder: $(this).attr("placeholder")
+          allowClear: true
           ajax:
             url: $(this).data("url")
             dataType: 'json'
@@ -22,16 +23,18 @@
         $(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()

data/app/assets/javascripts/crm_tags.js.coffee

@@ -7,16 +7,16 @@
 
   # The multiselect tag list has listeners to load/remove fieldsets related to tags
   #----------------------------------------------------------------------------
-  $(document).on 'select2-selecting', "[name*='tag_list']", (event) ->
+  $(document).on 'select2:select', "[name*='tag_list']", (event) ->
     url      = $(this).data('url')
     asset_id = $(this).data('asset-id')
     $.get(url, {
-      tag: event.val
+      tag: event.params.data.text
       asset_id: asset_id
       collapsed: "no"
     })
 
-  $(document).on 'select2-removing', "[name*='tag_list']", (event) ->
-    $("#field_groups div[data-tag='" + event.val + "']").remove()
+  $(document).on 'select2:unselect', "[name*='tag_list']", (event) ->
+    $("#field_groups div[data-tag='" + event.params.data.text + "']").remove()
 
 ) jQuery

data/app/assets/javascripts/crm_validations.js.coffee

@@ -0,0 +1,12 @@
+#------------------------------------------------------------------------------
+(($) ->
+
+  # Ensure that any html5 required fields are unhidden when invalid
+  #----------------------------------------------------------------------------
+  $(document).on 'click', 'form.simple_form input:submit', (event) ->
+    form = this.closest('form')
+    invalidInputs = form.querySelectorAll(':invalid')
+    $(invalidInputs).each ->
+      $(this).closest('.field_group').show()
+
+) jQuery

data/app/assets/stylesheets/bootstrap-custom.scss

@@ -165,12 +165,12 @@ button.navbar-toggler:focus {
       dl {
         li {
 	  width: 23%;
-	  font-size: 2rem;
+	  font-size: 1rem;
 	  dt {
-	    font-size: inherit;
+	    font-size: 0.75rem;
           }
           tt {
-	    font-size: inherit;
+	    font-size: 0.75rem;
 	  }
 	}
       }	

data/app/assets/stylesheets/common.scss

@@ -784,3 +784,12 @@ table.asset_attributes {
     background-color: darkgray;
   }
 }
+
+
+// Login page
+.form-group.user_remember_me {
+  border: 0px;
+  .form-check {
+    padding-left: 6px;
+  }
+}

data/app/assets/stylesheets/rails.scss

@@ -28,7 +28,7 @@
       padding: 0px; } } }
 
 .fieldWithErrors {
-  input {
+  input, select {
     border: {
       bottom: 1px solid lightpink;
       right: 1px solid lightpink; };

data/app/controllers/admin/fields_controller.rb

@@ -33,7 +33,7 @@ class Admin::FieldsController < Admin::ApplicationController
   # GET /fields/1/edit                                                   AJAX
   #----------------------------------------------------------------------------
   def edit
-    @field = Field.find(params[:id])
+    @field = Field.find(params["id"])
     respond_with(@field)
   end
 
@@ -41,12 +41,12 @@ class Admin::FieldsController < Admin::ApplicationController
   # POST /fields.xml                                                     AJAX
   #----------------------------------------------------------------------------
   def create
-    as = field_params[:as]
+    as = field_params["as"]
+    klass= Field.lookup_class(as).safe_constantize
     @field =
       if as.match?(/pair/)
-        CustomFieldPair.create_pair(params).first
+        klass.create_pair("pair" => pair_params, "field" => field_params).first
       elsif as.present?
-        klass = find_class(Field.lookup_class(as))
         klass.create(field_params)
       else
         Field.new(field_params).tap(&:valid?)
@@ -59,10 +59,10 @@ class Admin::FieldsController < Admin::ApplicationController
   # PUT /fields/1.xml                                                    AJAX
   #----------------------------------------------------------------------------
   def update
-    if field_params[:as].match?(/pair/)
-      @field = CustomFieldPair.update_pair(params).first
+    if field_params["as"].match?(/pair/)
+      @field = CustomFieldPair.update_pair("pair" => pair_params, "field" => field_params).first
     else
-      @field = Field.find(params[:id])
+      @field = Field.find(params["id"])
       @field.update(field_params)
     end
 
@@ -73,7 +73,7 @@ class Admin::FieldsController < Admin::ApplicationController
   # DELETE /fields/1.xml                                        HTML and AJAX
   #----------------------------------------------------------------------------
   def destroy
-    @field = Field.find(params[:id])
+    @field = Field.find(params["id"])
     @field.destroy
 
     respond_with(@field)
@@ -82,7 +82,7 @@ class Admin::FieldsController < Admin::ApplicationController
   # POST /fields/sort
   #----------------------------------------------------------------------------
   def sort
-    field_group_id = params[:field_group_id].to_i
+    field_group_id = params["field_group_id"].to_i
     field_ids = params["fields_field_group_#{field_group_id}"] || []
 
     field_ids.each_with_index do |id, index|
@@ -96,13 +96,12 @@ class Admin::FieldsController < Admin::ApplicationController
   #----------------------------------------------------------------------------
   def subform
     field = field_params
-    as = field[:as]
-
+    as = field_params["as"]
     @field = if (id = field[:id]).present?
                Field.find(id).tap { |f| f.as = as }
              else
                field_group_id = field[:field_group_id]
-               klass = find_class(Field.lookup_class(as))
+               klass = Field.lookup_class(as).safe_constantize
                klass.new(field_group_id: field_group_id, as: as)
       end
 
@@ -114,7 +113,11 @@ class Admin::FieldsController < Admin::ApplicationController
   protected
 
   def field_params
-    params[:field].permit!
+    params.require(:field).permit(:as, :collection_string, :disabled, :field_group_id, :hint, :label, :maxlength, :minlength, :name, :pair_id, :placeholder, :position, :required, :type, settings: {})
+  end
+
+  def pair_params
+    params.require(:pair).permit("0": [:hint, :required, :disabled, :id], "1": [:hint, :required, :disabled, :id])
   end
 
   def setup_current_tab

data/app/controllers/entities_controller.rb

@@ -83,7 +83,7 @@ class EntitiesController < ApplicationController
   #----------------------------------------------------------------------------
   def field_group
     if @tag = Tag.find_by_name(params[:tag].strip)
-      if @field_group = FieldGroup.find_by_tag_id_and_klass_name(@tag.id, klass.to_s)
+      if @field_groups = FieldGroup.where(tag_id: @tag.id, klass_name: klass.to_s).order(:label, :created_at)
         @asset = klass.find_by_id(params[:asset_id]) || klass.new
         render('fields/group') && return
       end

data/app/controllers/lists_controller.rb

@@ -9,13 +9,14 @@ class ListsController < ApplicationController
   # POST /lists
   #----------------------------------------------------------------------------
   def create
-    list_params[:user_id] = (current_user.id if params[:is_global].to_i.zero?)
+    list_attr = list_params.to_h
+    list_attr["user_id"] = current_user.id if params["is_global"] != "1"
 
     # Find any existing list with the same name (case insensitive)
-    if @list = List.where("lower(name) = ?", list_params[:name].downcase).where(user_id: list_params[:user_id]).first
-      @list.update(list_params)
+    if @list = List.where("lower(name) = ?", list_attr[:name].downcase).where(user_id: list_attr[:user_id]).first
+      @list.update(list_attr)
     else
-      @list = List.create(list_params)
+      @list = List.create(list_attr)
     end
 
     respond_with(@list)

data/app/helpers/application_helper.rb

@@ -36,7 +36,7 @@ module ApplicationHelper
   end
 
   def subtitle_link(id, text, hidden)
-    link_to("<small>#{hidden ? '&#9658;' : '&#9660;'}</small> #{sanitize text}".html_safe,
+    link_to("<small>#{hidden ? '&#9655;' : '&#9661;'}</small> #{sanitize text}".html_safe,
             url_for(controller: :home, action: :toggle, id: id),
             remote: true,
             onclick: "crm.flip_subtitle(this)")
@@ -99,7 +99,7 @@ module ApplicationHelper
 
   #----------------------------------------------------------------------------
   def arrow_for(id)
-    content_tag(:span, "&#9658;".html_safe, id: "#{id}_arrow", class: :arrow)
+    content_tag(:span, "&#9655;".html_safe, id: "#{id}_arrow", class: :arrow)
   end
 
   #----------------------------------------------------------------------------
@@ -115,13 +115,13 @@ module ApplicationHelper
 
   #----------------------------------------------------------------------------
   def link_to_delete(record, options = {})
-    confirm = options[:confirm] || nil
+    confirm = options[:confirm] || t(:confirm_delete, record.class.to_s.downcase)
 
     link_to(t(:delete) + "!",
             options[:url] || url_for(record),
             method: :delete,
             remote: true,
-            confirm: confirm)
+            data: { confirm: confirm })
   end
 
   #----------------------------------------------------------------------------

data/app/helpers/opportunities_helper.rb

@@ -41,8 +41,10 @@ module OpportunitiesHelper
     selected_campaign = Campaign.find_by_id(options[:selected])
     campaigns = ([selected_campaign] + Campaign.my(current_user).order(:name).limit(25)).compact.uniq
     collection_select :opportunity, :campaign_id, campaigns, :id, :name,
-                      { selected: options[:selected], prompt: t(:select_a_campaign) },
-                      style: 'width:330px;', class: 'select2'
+                      { selected: options[:selected], prompt: t(:select_a_campaign), include_blank: true },
+                      style: 'width:330px;', class: 'select2',
+                      placeholder: t(:select_a_campaign),
+                      "data-url": auto_complete_campaigns_path(format: 'json')
   end
 
   # Generates the inline revenue message for the opportunity list table.

data/app/helpers/users_helper.rb

@@ -25,7 +25,7 @@ module UsersHelper
     user_options = user_options_for_select(users, myself)
     select(asset, :assigned_to, user_options,
            { include_blank: t(:unassigned) },
-           style: 'width: 160px;',
+           style: 'width: 160px;', "data-allow-clear" => false,
            class: 'select2')
   end
 

data/app/models/entities/campaign.rb

@@ -35,8 +35,8 @@ class Campaign < ActiveRecord::Base
   belongs_to :user, optional: true # TODO: Is this really optional?
   belongs_to :assignee, class_name: "User", foreign_key: :assigned_to, optional: true # TODO: Is this really optional?
   has_many :tasks, as: :asset, dependent: :destroy # , :order => 'created_at DESC'
-  has_many :leads, -> { order "id DESC" }, dependent: :destroy
-  has_many :opportunities, -> { order "id DESC" }, dependent: :destroy
+  has_many :leads, -> { order "id DESC" }
+  has_many :opportunities, -> { order "id DESC" }
   has_many :emails, as: :mediator
 
   serialize :subscribed_users, Array

data/app/models/fields/custom_field_pair.rb

@@ -12,10 +12,9 @@ class CustomFieldPair < CustomField
   #------------------------------------------------------------------------------
   def self.create_pair(params)
     fields = params['field']
-    as = params['field']['as']
-    pair = params.delete('pair')
+    pair = params['pair']
     base_params = fields.delete_if { |k, _v| !%w[field_group_id label as].include?(k) }
-    klass = ("custom_field_" + as.gsub('pair', '_pair')).classify.constantize
+    klass = Field.lookup_class(fields['as']).safe_constantize
     field1 = klass.create(base_params.merge(pair['0']))
     field2 = klass.create(base_params.merge(pair['1']).merge('pair_id' => field1.id, 'required' => field1.required, 'disabled' => field1.disabled))
     [field1, field2]
@@ -25,19 +24,19 @@ class CustomFieldPair < CustomField
   #------------------------------------------------------------------------------
   def self.update_pair(params)
     fields = params['field']
-    pair = params.delete('pair')
+    pair = params['pair']
     base_params = fields.delete_if { |k, _v| !%w[field_group_id label as].include?(k) }
-    field1 = CustomFieldPair.find(params['id'])
+    field1 = CustomFieldPair.find(pair['0']['id'])
     field1.update(base_params.merge(pair['0']))
     field2 = field1.paired_with
     field2.update(base_params.merge(pair['1']).merge('required' => field1.required, 'disabled' => field1.disabled))
     [field1, field2]
   end
 
-  # Returns the field that this field is paired with
+  # Returns the field that this field is paired with (bi-directional)
   #------------------------------------------------------------------------------
   def paired_with
-    pair || CustomFieldPair.where(pair_id: id).first
+    pair || self.class.find_by_id(pair_id)
   end
 
   ActiveSupport.run_load_hooks(:fat_free_crm_custom_field_pair, self)

data/app/models/fields/field.rb

@@ -34,7 +34,7 @@ class Field < ActiveRecord::Base
   serialize :collection, Array
   serialize :settings, HashWithIndifferentAccess
 
-  belongs_to :field_group, optional: true # TODO: Is this really optional?
+  belongs_to :field_group, optional: true
 
   scope :core_fields,   -> { where(type: 'CoreField') }
   scope :custom_fields, -> { where("type != 'CoreField'") }
@@ -92,8 +92,6 @@ class Field < ActiveRecord::Base
 
   def render(value)
     case as
-    when 'checkbox'
-      value.to_s == '0' ? "no" : "yes"
     when 'date'
       value&.strftime(I18n.t("date.formats.mmddyy"))
     when 'datetime'

data/app/models/list.rb

@@ -8,7 +8,7 @@
 class List < ActiveRecord::Base
   validates_presence_of :name
   validates_presence_of :url
-  belongs_to :user
+  belongs_to :user, optional: true
 
   # Parses the controller from the url
   def controller

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/config/database.yml

@@ -3,7 +3,7 @@ development: &development
   adapter: postgresql
   database: fat_free_crm_development
   username: postgres
-  password:
+  password: postgres
   host:     localhost
   port:     5432
   schema_search_path: public
@@ -23,4 +23,3 @@ production:
 staging:
   <<: *development
   database: fat_free_crm_staging
-

data/config/initializers/action_mailer.rb

@@ -10,7 +10,7 @@
 #   ActionMailer is setup in test mode later on
 #
 unless Rails.env.test?
-  require './app/models/setting'
+  require 'setting'
 
   smtp_settings = Setting.smtp || {}
 

data/config/initializers/custom_field_ransack_translations.rb

@@ -6,8 +6,8 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 # Load field names for custom fields, for Ransack search
-require './app/models/setting'
-if Setting.database_and_table_exists?
+require 'setting'
+if Setting.database_and_table_exists? && ActiveRecord::Base.connection.table_exists?(:custom_fields)
   Rails.application.config.after_initialize do
     I18n.backend.load_translations
 

data/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
 #------------------------------------------------------------------------------

data/db/migrate/20230526212613_convert_to_active_storage.rb

@@ -16,7 +16,7 @@ class ConvertToActiveStorage < ActiveRecord::Migration[5.2]
                   end
 
     ActiveRecord::Base.connection.raw_connection.then do |conn|
-      if conn.is_a?(PG::Connection)
+      if conn.is_a?(::PG::Connection)
         conn.prepare('active_storage_blobs', <<-SQL)
           INSERT INTO active_storage_blobs (
             key, filename, content_type, metadata, byte_size, checksum, created_at

data/lib/fat_free_crm/custom_fields.rb

@@ -8,6 +8,7 @@
 
 #
 # Register CustomFields when Field class is loaded
+
 ActiveSupport.on_load(:fat_free_crm_field) do # self == Field
   register(as: 'date_pair', klass: 'CustomFieldDatePair', type: 'date')
   register(as: 'datetime_pair', klass: 'CustomFieldDatetimePair', type: 'timestamp')

data/lib/fat_free_crm/version.rb

@@ -9,7 +9,7 @@ module FatFreeCRM
   module VERSION # :nodoc:
     MAJOR = 0
     MINOR = 22
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: fat_free_crm
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Michael Dvorkin
 - Stephen Kenworthy
 - Daniel O'Connor
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -553,6 +553,7 @@ files:
 - app/assets/javascripts/crm_sortable.js.coffee
 - app/assets/javascripts/crm_tags.js.coffee
 - app/assets/javascripts/crm_textarea_autocomplete.js.coffee
+- app/assets/javascripts/crm_validations.js.coffee
 - app/assets/javascripts/datepicker.js.coffee
 - app/assets/javascripts/format_buttons.js.coffee
 - app/assets/javascripts/lists.js.coffee
@@ -1217,31 +1218,6 @@ files:
 - public/404.html
 - public/422.html
 - public/500.html
-- public/avatars/User/2/large_rails.png
-- public/avatars/User/2/medium_rails.png
-- public/avatars/User/2/original_rails.png
-- public/avatars/User/2/small_rails.png
-- public/avatars/User/2/thumb_rails.png
-- public/avatars/User/3/large_rails.png
-- public/avatars/User/3/medium_rails.png
-- public/avatars/User/3/original_rails.png
-- public/avatars/User/3/small_rails.png
-- public/avatars/User/3/thumb_rails.png
-- public/avatars/User/4/large_rails.png
-- public/avatars/User/4/medium_rails.png
-- public/avatars/User/4/original_rails.png
-- public/avatars/User/4/small_rails.png
-- public/avatars/User/4/thumb_rails.png
-- public/avatars/User/6/large_rails.png
-- public/avatars/User/6/medium_rails.png
-- public/avatars/User/6/original_rails.png
-- public/avatars/User/6/small_rails.png
-- public/avatars/User/6/thumb_rails.png
-- public/avatars/User/7/large_rails.png
-- public/avatars/User/7/medium_rails.png
-- public/avatars/User/7/original_rails.png
-- public/avatars/User/7/small_rails.png
-- public/avatars/User/7/thumb_rails.png
 - public/favicon.ico
 - public/robots.txt
 - vendor/assets/images/calendar_date_select/calendar.gif
@@ -1338,7 +1314,7 @@ homepage: http://fatfreecrm.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1353,8 +1329,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: Fat Free CRM
 test_files: []