fat_free_crm 0.15.0.beta.2 → 0.15.0

data/app/helpers/application_helper.rb

@@ -16,14 +16,14 @@ module ApplicationHelper
 
   #----------------------------------------------------------------------------
   def tabless_layout?
-    %w(authentications passwords).include?(controller.controller_name) ||
-      ((controller.controller_name == "users") && %w(create new).include?(controller.action_name))
+    %w[authentications passwords].include?(controller.controller_name) ||
+      ((controller.controller_name == "users") && %w[create new].include?(controller.action_name))
   end
 
   # Show existing flash or embed hidden paragraph ready for flash[:notice]
   #----------------------------------------------------------------------------
   def show_flash(options = { sticky: false })
-    [:error, :warning, :info, :notice].each do |type|
+    %i[error warning info notice].each do |type|
       if flash[type]
         html = content_tag(:div, h(flash[type]), id: "flash")
         flash[type] = nil
@@ -175,7 +175,7 @@ module ApplicationHelper
 
   #----------------------------------------------------------------------------
   def jumpbox(current)
-    tabs = [:campaigns, :accounts, :leads, :contacts, :opportunities]
+    tabs = %i[campaigns accounts leads contacts opportunities]
     current = tabs.first unless tabs.include?(current)
     tabs.map do |tab|
       link_to_function(t("tab_#{tab}"), "crm.jumper('#{tab}')", "html-data" => tab, class: (tab == current ? 'selected' : ''))
@@ -252,7 +252,7 @@ module ApplicationHelper
   # Display web presence mini-icons for Contact or Lead.
   #----------------------------------------------------------------------------
   def web_presence_icons(person)
-    [:blog, :linkedin, :facebook, :twitter, :skype].map do |site|
+    %i[blog linkedin facebook twitter skype].map do |site|
       url = person.send(site)
       unless url.blank?
         if site == :skype
@@ -302,7 +302,7 @@ module ApplicationHelper
   #----------------------------------------------------------------------------
   def get_browser_timezone_offset
     unless session[:timezone_offset]
-      "$.get('#{timezone_path}', {offset: (new Date()).getTimezoneOffset()});"
+      raw "$.get('#{timezone_path}', {offset: (new Date()).getTimezoneOffset()});"
     end
   end
 
@@ -368,15 +368,15 @@ module ApplicationHelper
     url_params[:view] = @view unless @view.blank? # tasks
     url_params[:id] = params[:id] unless params[:id].blank?
 
-    exports = %w(xls csv).map do |format|
+    exports = %w[xls csv].map do |format|
       link_to(format.upcase, url_params.merge(format: format), title: I18n.t(:"to_#{format}")) unless action.to_s == "show"
     end
 
-    feeds = %w(rss atom).map do |format|
+    feeds = %w[rss atom].map do |format|
       link_to(format.upcase, url_params.merge(format: format, authentication_credentials: token), title: I18n.t(:"to_#{format}"))
     end
 
-    links = %w(perm).map do |format|
+    links = ['perm'].map do |format|
       link_to(format.upcase, url_params, title: I18n.t(:"to_#{format}"))
     end
 

data/app/helpers/javascript_helper.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
+#
+# Fat Free CRM is freely distributable under the terms of MIT license.
+# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
+#------------------------------------------------------------------------------
 # Copied from prototype-rails which is no longer maintained
 
 module JavascriptHelper

data/app/helpers/opportunities_helper.rb

@@ -17,7 +17,7 @@ module OpportunitiesHelper
     amount = []
     summary << (opportunity.stage ? t(opportunity.stage) : t(:other))
     summary << number_to_currency(opportunity.weighted_amount, precision: 0)
-    unless %w(won lost).include?(opportunity.stage)
+    unless %w[won lost].include?(opportunity.stage)
       amount << number_to_currency(opportunity.amount || 0, precision: 0)
       amount << (opportunity.discount ? t(:discount_number, number_to_currency(opportunity.discount, precision: 0)) : t(:no_discount))
       amount << t(:probability_number, (opportunity.probability || 0).to_s + '%')

data/app/helpers/remote_link_pagination_helper.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
+#
+# Fat Free CRM is freely distributable under the terms of MIT license.
+# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
+#------------------------------------------------------------------------------
 module RemoteLinkPaginationHelper
   class LinkRenderer < WillPaginate::ActionView::LinkRenderer
     def link(text, target, attributes = {})

data/app/inputs/date_pair_input.rb

@@ -15,7 +15,7 @@ class DatePairInput < SimpleForm::Inputs::Base
     [field1, field2].compact.each do |field|
       out << '<div>'.html_safe
       label = field == field1 ? I18n.t('pair.start') : I18n.t('pair.end')
-      [:required, :disabled].each { |k| input_html_options.delete(k) } # ensure these come from field not default options
+      %i[required disabled].each { |k| input_html_options.delete(k) } # ensure these come from field not default options
       input_html_options.merge!(field.input_options)
       input_html_options[:value] = value(field)
       out << "<label#{' class="req"' if input_html_options[:required]}>#{label}</label>".html_safe

data/app/models/entities/account.rb

@@ -49,7 +49,7 @@ class Account < ActiveRecord::Base
   scope :created_by,  ->(user) { where(user_id: user.id) }
   scope :assigned_to, ->(user) { where(assigned_to: user.id) }
 
-  scope :text_search, ->(query) { search('name_or_email_cont' => query).result }
+  scope :text_search, ->(query) { ransack('name_or_email_cont' => query).result }
 
   scope :visible_on_dashboard, ->(user) {
     # Show accounts which either belong to the user and are unassigned, or are assigned to the user
@@ -67,7 +67,7 @@ class Account < ActiveRecord::Base
   exportable
   sortable by: ["name ASC", "rating DESC", "created_at DESC", "updated_at DESC"], default: "created_at DESC"
 
-  has_ransackable_associations %w(contacts opportunities tags activities emails addresses comments tasks)
+  has_ransackable_associations %w[contacts opportunities tags activities emails addresses comments tasks]
   ransack_can_autocomplete
 
   validates_presence_of :name, message: :missing_account_name

data/app/models/entities/account_contact.rb

@@ -20,7 +20,7 @@ class AccountContact < ActiveRecord::Base
   belongs_to :contact
 
   has_paper_trail class_name: 'Version', meta: { related: :contact },
-                  ignore: [:id, :created_at, :updated_at, :contact_id]
+                  ignore: %i[id created_at updated_at contact_id]
 
   validates_presence_of :account_id
 

data/app/models/entities/campaign.rb

@@ -45,7 +45,7 @@ class Campaign < ActiveRecord::Base
   scope :created_by,  ->(user) { where(user_id: user.id) }
   scope :assigned_to, ->(user) { where(assigned_to: user.id) }
 
-  scope :text_search, ->(query) { search('name_cont' => query).result }
+  scope :text_search, ->(query) { ransack('name_cont' => query).result }
 
   uses_user_permissions
   acts_as_commentable
@@ -56,11 +56,11 @@ class Campaign < ActiveRecord::Base
   exportable
   sortable by: ["name ASC", "target_leads DESC", "target_revenue DESC", "leads_count DESC", "revenue DESC", "starts_on DESC", "ends_on DESC", "created_at DESC", "updated_at DESC"], default: "created_at DESC"
 
-  has_ransackable_associations %w(leads opportunities tags activities emails comments tasks)
+  has_ransackable_associations %w[leads opportunities tags activities emails comments tasks]
   ransack_can_autocomplete
 
   validates_presence_of :name, message: :missing_campaign_name
-  validates_uniqueness_of :name, scope: [:user_id, :deleted_at]
+  validates_uniqueness_of :name, scope: %i[user_id deleted_at]
   validate :start_and_end_dates
   validate :users_for_shared_access
   validates :status, inclusion: { in: proc { Setting.unroll(:campaign_status).map { |s| s.last.to_s } } }, allow_blank: true

data/app/models/entities/contact.rb

@@ -52,7 +52,7 @@ class Contact < ActiveRecord::Base
 
   delegate :campaign, to: :lead, allow_nil: true
 
-  has_ransackable_associations %w(account opportunities tags activities emails addresses comments tasks)
+  has_ransackable_associations %w[account opportunities tags activities emails addresses comments tasks]
   ransack_can_autocomplete
 
   serialize :subscribed_users, Set
@@ -162,7 +162,7 @@ class Contact < ActiveRecord::Base
       assigned_to: params[:account][:assigned_to],
       access:      params[:access]
     }
-    %w(first_name last_name title source email alt_email phone mobile blog linkedin facebook twitter skype do_not_call background_info).each do |name|
+    %w[first_name last_name title source email alt_email phone mobile blog linkedin facebook twitter skype do_not_call background_info].each do |name|
       attributes[name] = model.send(name.intern)
     end
 
@@ -205,7 +205,7 @@ class Contact < ActiveRecord::Base
   #----------------------------------------------------------------------------
   def save_account(params)
     account_params = params[:account]
-    if account_params[:id] == "" || account_params[:name] == ""
+    if !account_params || account_params[:id] == "" || account_params[:name] == ""
       self.account = nil
     else
       self.account = Account.create_or_select_for(self, account_params)

data/app/models/entities/lead.rb

@@ -58,7 +58,7 @@ class Lead < ActiveRecord::Base
   scope :created_by,   ->(user) { where(user_id: user.id) }
   scope :assigned_to,  ->(user) { where(assigned_to: user.id) }
 
-  scope :text_search, ->(query) { search('first_name_or_last_name_or_company_or_email_cont' => query).result }
+  scope :text_search, ->(query) { ransack('first_name_or_last_name_or_company_or_email_cont' => query).result }
 
   uses_user_permissions
   acts_as_commentable
@@ -69,7 +69,7 @@ class Lead < ActiveRecord::Base
   exportable
   sortable by: ["first_name ASC", "last_name ASC", "company ASC", "rating DESC", "created_at DESC", "updated_at DESC"], default: "created_at DESC"
 
-  has_ransackable_associations %w(contact campaign tasks tags activities emails addresses comments)
+  has_ransackable_associations %w[contact campaign tasks tags activities emails addresses comments]
   ransack_can_autocomplete
 
   validates_presence_of :first_name, message: :missing_first_name, if: -> { Setting.require_first_names }

data/app/models/entities/opportunity.rb

@@ -54,7 +54,7 @@ class Opportunity < ActiveRecord::Base
     if query =~ /\A\d+\z/
       where('upper(name) LIKE upper(:name) OR opportunities.id = :id', name: "%#{query}%", id: query)
     else
-      search('name_cont' => query).result
+      ransack('name_cont' => query).result
     end
   }
 
@@ -75,11 +75,11 @@ class Opportunity < ActiveRecord::Base
   exportable
   sortable by: ["name ASC", "amount DESC", "amount*probability DESC", "probability DESC", "closes_on ASC", "created_at DESC", "updated_at DESC"], default: "created_at DESC"
 
-  has_ransackable_associations %w(account contacts tags campaign activities emails comments)
+  has_ransackable_associations %w[account contacts tags campaign activities emails comments]
   ransack_can_autocomplete
 
   validates_presence_of :name, message: :missing_opportunity_name
-  validates_numericality_of [:probability, :amount, :discount], allow_nil: true
+  validates_numericality_of %i[probability amount discount], allow_nil: true
   validate :users_for_shared_access
   validates :stage, inclusion: { in: proc { Setting.unroll(:opportunity_stage).map { |s| s.last.to_s } } }, allow_blank: true
 

data/app/models/fields/custom_field.rb

@@ -54,7 +54,7 @@ class CustomField < Field
   after_create :add_ransack_translation
 
   SAFE_DB_TRANSITIONS = {
-    any: [%w(date time timestamp), %w(integer float)],
+    any: [%w[date time timestamp], %w[integer float]],
     one: { 'string' => 'text' }
   }
 

data/app/models/fields/custom_field_pair.rb

@@ -12,7 +12,7 @@ class CustomFieldPair < CustomField
     fields = params['field']
     as = params['field']['as']
     pair = params.delete('pair')
-    base_params = fields.delete_if { |k, _v| !%w(field_group_id label as).include?(k) }
+    base_params = fields.delete_if { |k, _v| !%w[field_group_id label as].include?(k) }
     klass = ("custom_field_" + as.gsub('pair', '_pair')).classify.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))
@@ -24,7 +24,7 @@ class CustomFieldPair < CustomField
   def self.update_pair(params)
     fields = params['field']
     pair = params.delete('pair')
-    base_params = fields.delete_if { |k, _v| !%w(field_group_id label as).include?(k) }
+    base_params = fields.delete_if { |k, _v| !%w[field_group_id label as].include?(k) }
     field1 = CustomFieldPair.find(params['id'])
     field1.update_attributes(base_params.merge(pair['0']))
     field2 = field1.paired_with

data/app/models/fields/field.rb

@@ -69,7 +69,7 @@ class Field < ActiveRecord::Base
   def input_options
     input_html = {}
     attributes.reject do |k, v|
-      !%w(as collection disabled label placeholder required maxlength).include?(k) || v.blank?
+      !%w[as collection disabled label placeholder required maxlength].include?(k) || v.blank?
     end.symbolize_keys.merge(input_html)
   end
 

data/app/models/polymorphic/address.rb

@@ -36,7 +36,7 @@ class Address < ActiveRecord::Base
   #----------------------------------------------------------------------------
   def blank?
     if Setting.compound_address
-      %w(street1 street2 city state zipcode country).all? { |attr| send(attr).blank? }
+      %w[street1 street2 city state zipcode country].all? { |attr| send(attr).blank? }
     else
       full_address.blank?
     end
@@ -50,7 +50,7 @@ class Address < ActiveRecord::Base
   #   accepts_nested_attributes_for :business_address, :allow_destroy => true, :reject_if => proc {|attributes| Address.reject_address(attributes)}
   def self.reject_address(attributes)
     exists = attributes['id'].present?
-    empty = %w(street1 street2 city state zipcode country full_address).map { |name| attributes[name].blank? }.all?
+    empty = %w[street1 street2 city state zipcode country full_address].map { |name| attributes[name].blank? }.all?
     attributes[:_destroy] = 1 if exists && empty
     (!exists && empty)
   end

data/app/models/polymorphic/avatar.rb

@@ -36,7 +36,7 @@ class Avatar < ActiveRecord::Base
   end
   has_attached_file :image, styles: STYLES.dup, url: "/avatars/:entity_type/:id/:style_:filename", default_url: "/assets/avatar.jpg"
   validates_attachment :image, presence: true,
-                               content_type: { content_type: %w(image/jpeg image/jpg image/png image/gif) }
+                               content_type: { content_type: ['image/jpeg', 'image/jpg', 'image/png', 'image/gif'] }
 
   # Convert STYLE symbols to 'w x h' format for Gravatar and Rails
   # e.g. Avatar.size_from_style(:size => :large) -> '75x75'
@@ -44,7 +44,9 @@ class Avatar < ActiveRecord::Base
   #----------------------------------------------------------------------------
   def self.size_from_style!(options)
     if options[:width] && options[:height]
-      options[:size] = [:width, :height].map { |d| options[d] }.join("x")
+      options[:size] = %i[width height].map { |d| options[d] }.join("x")
+      options.delete(:width)
+      options.delete(:height)
     elsif Avatar::STYLES.keys.include?(options[:size])
       options[:size] = Avatar::STYLES[options[:size]].sub(/\#\z/, '')
     end

data/app/models/polymorphic/email.rb

@@ -46,14 +46,16 @@ class Email < ActiveRecord::Base
     super
   end
 
-  def body_with_textile
-    if defined?(RedCloth)
-      RedCloth.new(body_without_textile).to_html
-    else
-      body_without_textile.to_s.gsub("\n", "<br/>")
+  module BodyWithTextile
+    def body
+      if defined?(RedCloth)
+        RedCloth.new(super).to_html
+      else
+        super.to_s.gsub("\n", "<br/>")
+      end
     end
   end
-  alias_method_chain :body, :textile
+  prepend BodyWithTextile
 
   ActiveSupport.run_load_hooks(:fat_free_crm_email, self)
 end

data/app/models/polymorphic/task.rb

@@ -26,8 +26,10 @@
 #
 
 class Task < ActiveRecord::Base
+  include ActiveModel::Serializers::Xml
+
   attr_accessor :calendar
-  ALLOWED_VIEWS = %w(pending assigned completed)
+  ALLOWED_VIEWS = %w[pending assigned completed]
 
   belongs_to :user
   belongs_to :assignee, class_name: "User", foreign_key: :assigned_to

data/app/models/polymorphic/version.rb

@@ -6,9 +6,9 @@
 require 'paper_trail'
 
 class Version < PaperTrail::Version
-  ASSETS = %w(all tasks campaigns leads accounts contacts opportunities comments emails)
-  EVENTS = %w(all_events create view update destroy)
-  DURATION = %w(one_hour one_day two_days one_week two_weeks one_month)
+  ASSETS = %w[all tasks campaigns leads accounts contacts opportunities comments emails]
+  EVENTS = %w[all_events create view update destroy]
+  DURATION = %w[one_hour one_day two_days one_week two_weeks one_month]
 
   belongs_to :related, polymorphic: true
   belongs_to :user, foreign_key: :whodunnit

data/app/models/users/ability.rb

@@ -50,7 +50,7 @@ class Ability
             can :manage, klass, id: asset_ids
           end
         end
-      end # if user.admin?
+      end
 
     end
   end

data/app/models/users/permission.rb

@@ -23,5 +23,7 @@ class Permission < ActiveRecord::Base
   validates_presence_of :user_id, unless: :group_id?
   validates_presence_of :group_id, unless: :user_id?
 
+  validates_uniqueness_of :user_id, scope: %i[group_id asset_id asset_type]
+
   ActiveSupport.run_load_hooks(:fat_free_crm_permission, self)
 end

data/app/models/users/user.rb

@@ -159,7 +159,7 @@ class User < ActiveRecord::Base
   # Prevent deleting a user unless she has no artifacts left.
   #----------------------------------------------------------------------------
   def has_related_assets?
-    sum = %w(Account Campaign Lead Contact Opportunity Comment Task).detect do |asset|
+    sum = %w[Account Campaign Lead Contact Opportunity Comment Task].detect do |asset|
       klass = asset.constantize
 
       asset != "Comment" && klass.assigned_to(self).exists? || klass.created_by(self).exists?
@@ -177,7 +177,7 @@ class User < ActiveRecord::Base
     end
 
     def can_signup?
-      [:allowed, :needs_approval].include? Setting.user_signup
+      %i[allowed needs_approval].include? Setting.user_signup
     end
   end
 

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

@@ -8,4 +8,4 @@
 
 $('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
 $('#export').html('#{ j render(:partial => "shared/export") }');
-$('#search_results_count').html('#{ j render(:text => t('search_results_count', :count => @search_results_count)) }');
+$('#search_results_count').html('#{ j render(:plain => t('search_results_count', :count => @search_results_count)) }');

data/app/views/admin/fields/_sort_by.html.haml

@@ -6,5 +6,5 @@
     trigger   : "#sort_by",
     fade      : 500,
     appear    : 500,
-    menu_items: [ #{sort_by_menu_items.join(",")} ]
+    menu_items: [ #{raw sort_by_menu_items.join(",")} ]
   });

data/app/views/admin/users/_user.html.haml

@@ -9,7 +9,7 @@
   - else
     .strip.active #{t :user_active}
 
-  = avatar_for(user, size: :medium, width: '30', height: '30')
+  = avatar_for(user, width: '30', height: '30')
 
   .indentfull
     .tools

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

@@ -8,4 +8,4 @@
 
 $('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
 $('#export').html('#{ j render(:partial => "shared/export") }');
-$('#search_results_count').html('#{ j render(:text => t('search_results_count', :count => @search_results_count)) }');
+$('#search_results_count').html('#{ j render(:plain => t('search_results_count', :count => @search_results_count)) }');

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

@@ -8,4 +8,4 @@
 
 $('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
 $('#export').html('#{ j render(:partial => "shared/export") }');
-$('#search_results_count').html('#{ j render(:text => t('search_results_count', :count => @search_results_count)) }');
+$('#search_results_count').html('#{ j render(:plain => t('search_results_count', :count => @search_results_count)) }');

data/app/views/entities/_basic_search.html.haml

@@ -20,5 +20,5 @@
     trigger   : "#sort_by",
     fade      : 500,
     appear    : 500,
-    menu_items: [ #{sort_by_menu_items.join(",")} ]
+    menu_items: [ #{raw sort_by_menu_items.join(",")} ]
   });

data/app/views/home/_duration_menu.html.haml

@@ -4,5 +4,5 @@
     fade      : 500,
     appear    : 500,
     width     : 165,
-    menu_items: [ #{sort_by_duration.join(",")} ]
+    menu_items: [ #{raw sort_by_duration.join(",")} ]
   });