fat_free_crm 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 325977901a3011b43c20379a5e03317660a3cd2b702e36ceb7aa255ec0f6ff17
-  data.tar.gz: 6badcc5bfcc41d304fe646a7ea07d1c4fce631b3a60efd08285752fe645e3572
+  metadata.gz: 170884fee8c43222891b33e09f6a1996c6a33c70cf5839de3eae5ab987340ef1
+  data.tar.gz: d1f638adddae45577b72fc71d24b88f1ec7ca8513b98ae2a29ba9977ea5b5c28
 SHA512:
-  metadata.gz: 58f6a285322ca7ae834bbf2eeeaf0073a2c501f9dd71117b890c9d7a1403dd3b2e5f725e97d2b3814836f854595eb77f322e09a27a94202fb65ca7b28078cd47
-  data.tar.gz: 004b7dadb4c2c77e4863010b59a87dc89500142bc52fe0d90f81e71532d964b287f1bd97365bdd9460898249c0278e0ca389eba9edba1260c3410d0131302d0b
+  metadata.gz: e5284a4f39f18595dfb12b87acf4052fb464a432675959f3c0e58a6edb3eeb59899e11bcff8433e3f251656bba35eea6e5f0abde513d4dc56c1c3fce98f576d3
+  data.tar.gz: 5644a00f3ebf9db88505d686591856d8614c4ac7908bf484fe5147494b656aacda669e236fcabdce48801d9e96cf19454b22f586aa2902ffb3e70c3bffd75a32

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_textarea_autocomplete.js.coffee

@@ -17,17 +17,14 @@
             
             # Only autocomplete if search term starts with '@'
             return []  unless text.indexOf("@") is 0
-            words = []
-            i = 0
-
-            while i < _ffcrm_users.length
-              name_query = text.replace("@", "").toLowerCase()
-              words.push _ffcrm_users[i]  unless _ffcrm_users[i].toLowerCase().indexOf(name_query) is -1
-              i++
-            cb words, text.replace("@", "")
+            $.ajax
+              url: "/users/auto_complete"
+              data:
+                term: text.replace("@", "")
+              success: (response) ->
+                cb response, text.replace("@", "")
 
           selected: (text, data) ->
             username_regEx = new RegExp("\\((@[^)]+)\\)")
             text.match(username_regEx)[1]
-
 ) 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": %i[hint required disabled id], "1": %i[hint required disabled id])
   end
 
   def setup_current_tab

data/app/controllers/application_controller.rb

@@ -79,7 +79,7 @@ class ApplicationController < ActionController::Base
   # See http://blog.nvisium.com/2014/09/understanding-protectfromforgery.html for more details.
   #----------------------------------------------------------------------------
   def handle_unverified_request
-    raise ActionController::InvalidAuthenticityToken
+    raise ActionController::InvalidAuthenticityToken unless ENV.fetch('CODESPACE_NAME', nil) && Rails.env.development?
   end
 
   #

data/app/controllers/emails_controller.rb

@@ -15,6 +15,6 @@ class EmailsController < ApplicationController
     @email.destroy
     respond_with(@email)
   end
-  
+
   ActiveSupport.run_load_hooks(:fat_free_crm_emails_controller, self)
 end

data/app/controllers/entities/contacts_controller.rb

@@ -164,6 +164,6 @@ class ContactsController < EntitiesController
       redirect_to contacts_path
     end
   end
-  
+
   ActiveSupport.run_load_hooks(:fat_free_crm_contacts_controller, self)
 end

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/controllers/users_controller.rb

@@ -63,9 +63,7 @@ class UsersController < ApplicationController
         end
       end
       responds_to_parent do
-        # Without return RSpec2 screams bloody murder about rendering twice:
-        # within the block and after yield in responds_to_parent.
-        render && (return if Rails.env.test?)
+        render
       end
     end
   end
@@ -111,6 +109,20 @@ class UsersController < ApplicationController
     @unassigned_opportunities = Opportunity.my(current_user).unassigned.pipeline.order(:stage).includes(:account, :user, :tags)
   end
 
+  def auto_complete
+    @query = params[:term] || ''
+    @users = User.my(current_user).text_search(@query).limit(10).order(:first_name, :last_name)
+
+    respond_to do |format|
+      format.json do
+        results = @users.map do |a|
+          helpers.j(a.full_name + " (@" + a.username + ")")
+        end
+        render json: results
+      end
+    end
+  end
+
   protected
 
   def user_params

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
 
   #----------------------------------------------------------------------------
@@ -155,7 +155,7 @@ module ApplicationHelper
   #----------------------------------------------------------------------------
   def link_to_email(email, length = nil, &_block)
     name = (length ? truncate(email, length: length) : email)
-    bcc = Setting&.email_dropbox
+    bcc = Setting.email_dropbox
     mailto = if bcc && bcc[:address].present?
                "#{email}?bcc=#{bcc[:address]}"
              else

data/app/helpers/leads_helper.rb

@@ -69,7 +69,7 @@ module LeadsHelper
   #----------------------------------------------------------------------------
   def lead_summary(lead)
     summary = []
-    summary << (lead.status ? t(lead.status) : t(:other))
+    summary << t(lead.status || :other)
 
     if lead.company? && lead.title?
       summary << t(:works_at, job_title: lead.title, company: lead.company)

data/app/helpers/opportunities_helper.rb

@@ -17,7 +17,7 @@ module OpportunitiesHelper
   def opportunity_summary(opportunity)
     summary = []
     amount = []
-    summary << (opportunity.stage ? t(opportunity.stage) : t(:other))
+    summary << t(opportunity.stage || :other)
     summary << number_to_currency(opportunity.weighted_amount, precision: 0)
     unless %w[won lost].include?(opportunity.stage)
       amount << number_to_currency(opportunity.amount.to_f, precision: 0)
@@ -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
@@ -103,7 +103,7 @@ class Campaign < ActiveRecord::Base
   # Make sure end date > start date.
   #----------------------------------------------------------------------------
   def start_and_end_dates
-    errors.add(:ends_on, :dates_not_in_sequence) if (starts_on && ends_on) && (starts_on > ends_on)
+    errors.add(:ends_on, :dates_not_in_sequence) if starts_on && ends_on && (starts_on > ends_on)
   end
 
   # Make sure at least one user has been selected if the campaign is being shared.

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/models/observers/lead_observer.rb

@@ -16,7 +16,8 @@ class LeadObserver < ActiveRecord::Observer
 
   def after_update(item)
     original = @@leads.delete(item.id)
-    return log_activity(item, :reject) if original&.status != "rejected" && item.status == "rejected"
+
+    log_activity(item, :reject) if original&.status != "rejected" && item.status == "rejected"
   end
 
   private

data/app/models/observers/task_observer.rb

@@ -19,7 +19,8 @@ class TaskObserver < ActiveRecord::Observer
     if original
       return log_activity(item, :complete)   if item.completed_at && original.completed_at.nil?
       return log_activity(item, :reassign)   if item.assigned_to != original.assigned_to
-      return log_activity(item, :reschedule) if item.bucket != original.bucket
+
+      log_activity(item, :reschedule) if item.bucket != original.bucket
     end
   end
 

data/app/models/polymorphic/address.rb

@@ -54,7 +54,8 @@ class Address < ActiveRecord::Base
     exists = attributes['id'].present?
     empty = %w[street1 street2 city state zipcode country full_address].map { |name| attributes[name].blank? }.all?
     attributes[:_destroy] = 1 if exists && empty
-    (!exists && empty)
+
+    !exists && empty
   end
 
   ActiveSupport.run_load_hooks(:fat_free_crm_address, self)

data/app/models/polymorphic/comment.rb

@@ -52,10 +52,9 @@ class Comment < ActiveRecord::Base
 
   # Notify subscribed users when a comment is added, unless user created this comment
   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_later
-      end
+    users_to_notify = User.where(id: commentable.subscribed_users.reject { |user_id| user_id == user.id })
+    users_to_notify.select(&:emailable?).each do |subscriber|
+      SubscriptionMailer.comment_notification(subscriber, self).deliver_later
     end
   end
 

data/app/models/polymorphic/task.rb

@@ -103,7 +103,7 @@ class Task < ActiveRecord::Base
   scope :completed_last_month, -> { where('completed_at >= ? AND completed_at < ?', (Time.zone.now.beginning_of_month.utc - 1.day).beginning_of_month.utc, Time.zone.now.beginning_of_month.utc) }
 
   scope :text_search, lambda { |query|
-    query = query.gsub(/[^\w\s\-\.'\p{L}]/u, '').strip
+    query = query.gsub(/[^\w\s\-.'\p{L}]/u, '').strip
     where('upper(name) LIKE upper(?)', "%#{query}%")
   }
 

data/app/models/users/user.rb

@@ -73,7 +73,7 @@ class User < ActiveRecord::Base
   scope :by_name, -> { order('first_name, last_name, email') }
 
   scope :text_search, lambda { |query|
-    query = query.gsub(/[^\w\s\-\.'\p{L}]/u, '').strip
+    query = query.gsub(/[^\w\s\-.'\p{L}]/u, '').strip
     where('upper(username) LIKE upper(:s) OR upper(email) LIKE upper(:s) OR upper(first_name) LIKE upper(:s) OR upper(last_name) LIKE upper(:s)', s: "%#{query}%")
   }
 
@@ -134,6 +134,12 @@ class User < ActiveRecord::Base
     end
   end
 
+  # Send emails to active users only
+  #----------------------------------------------------------------------------
+  def emailable?
+    confirmed? && !awaits_approval? && !suspended? && email.present?
+  end
+
   #----------------------------------------------------------------------------
   def preference
     @preference ||= preferences.build

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)