fat_free_crm 0.12.3 → 0.13.0

data/app/models/fields/custom_field.rb

@@ -49,6 +49,7 @@
 class CustomField < Field
   after_validation :update_column, :on => :update
   before_create    :add_column
+  after_create     :add_ransack_translation
 
   SAFE_DB_TRANSITIONS = {
     :any => [['date', 'time', 'timestamp'], ['integer', 'float']],
@@ -129,6 +130,15 @@ class CustomField < Field
     klass.serialize_custom_fields!
   end
 
+  # Adds custom field translation for Ransack
+  def add_ransack_translation
+    I18n.backend.store_translations(Setting.locale.to_sym, {
+      ransack: {attributes: {klass.model_name.singular => {name => label}}}
+    })
+    # Reset Ransack cache
+    Ransack::Helpers::FormBuilder.cached_searchable_attributes_for_base = {}
+  end
+
   # Change database column type only if safe to do so
   # Note: columns will never be renamed or destroyed
   #------------------------------------------------------------------------------

data/app/models/fields/field.rb

@@ -33,9 +33,9 @@ class Field < ActiveRecord::Base
 
   belongs_to :field_group
 
-  scope :core_fields, where(:type => 'CoreField')
-  scope :custom_fields, where("type != 'CoreField'")
-  scope :without_pairs, where(:pair_id => nil)
+  scope :core_fields,   -> { where(:type => 'CoreField') }
+  scope :custom_fields, -> { where("type != 'CoreField'") }
+  scope :without_pairs, -> { where(:pair_id => nil) }
 
   delegate :klass, :klass_name, :klass_name=, :to => :field_group
 

data/app/models/fields/field_group.rb

@@ -54,7 +54,7 @@ class FieldGroup < ActiveRecord::Base
   # When deleted, transfer fields to default field group
   def move_fields_to_default_field_group
     default_group = FieldGroup.find_by_name_and_klass_name("custom_fields", klass_name)
-    default_group.fields << fields
+    default_group.fields << fields if default_group
     self.reload
   end
 

data/app/models/list.rb

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

data/app/models/polymorphic/address.rb

@@ -28,9 +28,9 @@ class Address < ActiveRecord::Base
 
   has_paper_trail :meta => { :related => :addressable }
 
-  scope :business, :conditions => "address_type='Business'"
-  scope :billing,  :conditions => "address_type='Billing'"
-  scope :shipping, :conditions => "address_type='Shipping'"
+  scope :business, -> { where("address_type='Business'") }
+  scope :billing,  -> { where("address_type='Billing'") }
+  scope :shipping, -> { where("address_type='Shipping'") }
 
   # Checks if the address is blank for both single and compound addresses.
   #----------------------------------------------------------------------------

data/app/models/polymorphic/comment.rb

@@ -44,12 +44,10 @@ class Comment < ActiveRecord::Base
 
   # Notify subscribed users when a comment is added, unless user created this comment
   def notify_subscribers
+    return unless Rails.application.config.action_mailer.smtp_settings.present?
     commentable.subscribed_users.reject{|user_id| user_id == user.id}.each do |subscriber_id|
       if subscriber = User.find_by_id(subscriber_id)
-        # Only send email if SMTP settings are configured
-        if Rails.application.config.action_mailer.smtp_settings.present?
-          SubscriptionMailer.comment_notification(subscriber, self).deliver
-        end
+        SubscriptionMailer.comment_notification(subscriber, self).deliver
       end
     end
   end

data/app/models/polymorphic/task.rb

@@ -37,62 +37,67 @@ class Task < ActiveRecord::Base
 
   # Tasks created by the user for herself, or assigned to her by others. That's
   # what gets shown on Tasks/Pending and Tasks/Completed pages.
-  scope :my, lambda { |*args|
+  scope :my, ->(*args) {
     options = args[0] || {}
-    user_option = options[:user] || User.current_user
+    user_option = (options.is_a?(Hash) ? options[:user] : options) || User.current_user
     includes(:assignee).
     where('(user_id = ? AND assigned_to IS NULL) OR assigned_to = ?', user_option, user_option).
     order(options[:order] || 'name ASC').
     limit(options[:limit]) # nil selects all records
   }
 
+  scope :created_by,  ->(user) { where(:user_id => user.id) }
+  scope :assigned_to, ->(user) { where(:assigned_to => user.id) }
+
   # Tasks assigned by the user to others. That's what we see on Tasks/Assigned.
-  scope :assigned_by, lambda { |user|
+  scope :assigned_by, ->(user) {
     includes(:assignee).
     where('user_id = ? AND assigned_to IS NOT NULL AND assigned_to != ?', user.id, user.id)
   }
 
   # Tasks created by the user or assigned to the user, i.e. the union of the two
   # scopes above. That's the tasks the user is allowed to see and track.
-  scope :tracked_by, lambda { |user|
+  scope :tracked_by, ->(user) {
     includes(:assignee).
     where('user_id = ? OR assigned_to = ?', user.id, user.id)
   }
 
-  scope :visible_on_dashboard, lambda { |user|
+  scope :visible_on_dashboard, ->(user) {
     # Show opportunities which either belong to the user and are unassigned, or are assigned to the user
     where('(user_id = :user_id AND assigned_to IS NULL) OR assigned_to = :user_id', :user_id => user.id).where('completed_at IS NULL')
   }
 
-  scope :by_due_at, order({
-    "MySQL"      => "due_at NOT NULL, due_at ASC",
-    "PostgreSQL" => "due_at ASC NULLS FIRST"
-  }[ActiveRecord::Base.connection.adapter_name] || :due_at)
+  scope :by_due_at, -> {
+      order({
+      "MySQL"      => "due_at NOT NULL, due_at ASC",
+      "PostgreSQL" => "due_at ASC NULLS FIRST"
+    }[ActiveRecord::Base.connection.adapter_name] || :due_at)
+  }
 
 
   # Status based scopes to be combined with the due date and completion time.
-  scope :pending,       where('completed_at IS NULL').order('tasks.due_at, tasks.id')
-  scope :assigned,      where('completed_at IS NULL AND assigned_to IS NOT NULL').order('tasks.due_at, tasks.id')
-  scope :completed,     where('completed_at IS NOT NULL').order('tasks.completed_at DESC')
+  scope :pending,       -> { where('completed_at IS NULL').order('tasks.due_at, tasks.id') }
+  scope :assigned,      -> { where('completed_at IS NULL AND assigned_to IS NOT NULL').order('tasks.due_at, tasks.id') }
+  scope :completed,     -> { where('completed_at IS NOT NULL').order('tasks.completed_at DESC') }
 
   # Due date scopes.
-  scope :due_asap,      where("due_at IS NULL AND bucket = 'due_asap'").order('tasks.id DESC')
-  scope :overdue,       where('due_at IS NOT NULL AND due_at < ?', Time.zone.now.midnight.utc).order('tasks.id DESC')
-  scope :due_today,     where('due_at >= ? AND due_at < ?', Time.zone.now.midnight.utc, Time.zone.now.midnight.tomorrow.utc).order('tasks.id DESC')
-  scope :due_tomorrow,  where('due_at >= ? AND due_at < ?', Time.zone.now.midnight.tomorrow.utc, Time.zone.now.midnight.tomorrow.utc + 1.day).order('tasks.id DESC')
-  scope :due_this_week, where('due_at >= ? AND due_at < ?', Time.zone.now.midnight.tomorrow.utc + 1.day, Time.zone.now.next_week.utc).order('tasks.id DESC')
-  scope :due_next_week, where('due_at >= ? AND due_at < ?', Time.zone.now.next_week.utc, Time.zone.now.next_week.end_of_week.utc + 1.day).order('tasks.id DESC')
-  scope :due_later,     where("(due_at IS NULL AND bucket = 'due_later') OR due_at >= ?", Time.zone.now.next_week.end_of_week.utc + 1.day).order('tasks.id DESC')
+  scope :due_asap,      -> { where("due_at IS NULL AND bucket = 'due_asap'").order('tasks.id DESC') }
+  scope :overdue,       -> { where('due_at IS NOT NULL AND due_at < ?', Time.zone.now.midnight.utc).order('tasks.id DESC') }
+  scope :due_today,     -> { where('due_at >= ? AND due_at < ?', Time.zone.now.midnight.utc, Time.zone.now.midnight.tomorrow.utc).order('tasks.id DESC') }
+  scope :due_tomorrow,  -> { where('due_at >= ? AND due_at < ?', Time.zone.now.midnight.tomorrow.utc, Time.zone.now.midnight.tomorrow.utc + 1.day).order('tasks.id DESC') }
+  scope :due_this_week, -> { where('due_at >= ? AND due_at < ?', Time.zone.now.midnight.tomorrow.utc + 1.day, Time.zone.now.next_week.utc).order('tasks.id DESC') }
+  scope :due_next_week, -> { where('due_at >= ? AND due_at < ?', Time.zone.now.next_week.utc, Time.zone.now.next_week.end_of_week.utc + 1.day).order('tasks.id DESC') }
+  scope :due_later,     -> { where("(due_at IS NULL AND bucket = 'due_later') OR due_at >= ?", Time.zone.now.next_week.end_of_week.utc + 1.day).order('tasks.id DESC') }
 
   # Completion time scopes.
-  scope :completed_today,      where('completed_at >= ? AND completed_at < ?', Time.zone.now.midnight.utc, Time.zone.now.midnight.tomorrow.utc)
-  scope :completed_yesterday,  where('completed_at >= ? AND completed_at < ?', Time.zone.now.midnight.yesterday.utc, Time.zone.now.midnight.utc)
-  scope :completed_this_week,  where('completed_at >= ? AND completed_at < ?', Time.zone.now.beginning_of_week.utc , Time.zone.now.midnight.yesterday.utc)
-  scope :completed_last_week,  where('completed_at >= ? AND completed_at < ?', Time.zone.now.beginning_of_week.utc - 7.days, Time.zone.now.beginning_of_week.utc)
-  scope :completed_this_month, where('completed_at >= ? AND completed_at < ?', Time.zone.now.beginning_of_month.utc, Time.zone.now.beginning_of_week.utc - 7.days)
-  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|
+  scope :completed_today,      -> { where('completed_at >= ? AND completed_at < ?', Time.zone.now.midnight.utc, Time.zone.now.midnight.tomorrow.utc) }
+  scope :completed_yesterday,  -> { where('completed_at >= ? AND completed_at < ?', Time.zone.now.midnight.yesterday.utc, Time.zone.now.midnight.utc) }
+  scope :completed_this_week,  -> { where('completed_at >= ? AND completed_at < ?', Time.zone.now.beginning_of_week.utc , Time.zone.now.midnight.yesterday.utc) }
+  scope :completed_last_week,  -> { where('completed_at >= ? AND completed_at < ?', Time.zone.now.beginning_of_week.utc - 7.days, Time.zone.now.beginning_of_week.utc) }
+  scope :completed_this_month, -> { where('completed_at >= ? AND completed_at < ?', Time.zone.now.beginning_of_month.utc, Time.zone.now.beginning_of_week.utc - 7.days) }
+  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, ->(query) {
     query = query.gsub(/[^\w\s\-\.'\p{L}]/u, '').strip
     where('upper(name) LIKE upper(?)', "%#{query}%")
   }

data/app/models/setting.rb

@@ -101,16 +101,10 @@ class Setting < ActiveRecord::Base
 
     # Loads settings from YAML files
     def load_settings_from_yaml(file)
-      begin
-        YAML::ENGINE.yamler = 'syck' # remove this when files are converted to Psych
-        settings = YAML.load_file(file)
-        # Merge settings into current settings hash (recursively)
-        @@yaml_settings.deep_merge!(settings)
-      rescue Exception => ex
-        puts "Settings couldn't be loaded from #{file}: #{ex.message}"
-      end
-      yaml_settings
+      settings = YAML.load_file(file)
+      @@yaml_settings.deep_merge!(settings)
     end
+
   end
 
   ActiveSupport.run_load_hooks(:fat_free_crm_setting, self)

data/app/models/users/ability.rb

@@ -9,22 +9,11 @@ class Ability
   include CanCan::Ability
 
   def initialize(user)
-
-    # handle signup
-    can(:create, User) if User.can_signup?
-
     if user.present?
       entities = [Account, Campaign, Contact, Lead, Opportunity]
 
-      # User
-      can :manage, User, id: user.id # can do any action on themselves
-
-      # Tasks
-      can :create, Task
-      can :manage, Task, user: user.id
-      can :manage, Task, assigned_to: user.id
-
-      # Entities
+      can :create, :all
+      can :read, [User] # for search autocomplete
       can :manage, entities, :access => 'Public'
       can :manage, entities + [Task], :user_id => user.id
       can :manage, entities + [Task], :assigned_to => user.id

data/app/models/users/user.rb

@@ -56,27 +56,28 @@ class User < ActiveRecord::Base
   has_many    :assigned_opportunities, :class_name => 'Opportunity', :foreign_key => 'assigned_to'
   has_many    :permissions, :dependent => :destroy
   has_many    :preferences, :dependent => :destroy
+  has_many    :lists
   has_and_belongs_to_many :groups
 
   has_paper_trail :ignore => [:last_request_at, :perishable_token]
 
   # For some reason this does not play nice with has_paper_trail when set as default scope
-  scope :by_id, order('id DESC')
-  scope :except, lambda { |user| where('id != ?', user.id).by_name }
-  scope :by_name, order('first_name, last_name, email')
+  scope :by_id, -> { order('id DESC') }
+  scope :except, ->(user) { where('id != ?', user.id).by_name }
+  scope :by_name, -> { order('first_name, last_name, email') }
 
-  scope :text_search, lambda { |query|
+  scope :text_search, ->(query) {
     query = query.gsub(/[^\w\s\-\.'\p{L}]/u, '').strip
     where('upper(username) LIKE upper(:s) OR upper(first_name) LIKE upper(:s) OR upper(last_name) LIKE upper(:s)', :s => "%#{query}%")
   }
 
-  scope :my, lambda {
-    accessible_by(User.current_ability)
-  }
+  scope :my, -> { accessible_by(User.current_ability) }
 
-  scope :have_assigned_opportunities, joins("INNER JOIN opportunities ON users.id = opportunities.assigned_to").
-                                      where("opportunities.stage <> 'lost' AND opportunities.stage <> 'won'").
-                                      select('DISTINCT(users.id), users.*')
+  scope :have_assigned_opportunities, -> {
+    joins("INNER JOIN opportunities ON users.id = opportunities.assigned_to")
+    .where("opportunities.stage <> 'lost' AND opportunities.stage <> 'won'")
+    .select('DISTINCT(users.id), users.*')
+  }
 
   acts_as_authentic do |c|
     c.session_class = Authentication
@@ -171,7 +172,7 @@ class User < ActiveRecord::Base
   # Prevent deleting a user unless she has no artifacts left.
   #----------------------------------------------------------------------------
   def check_if_has_related_assets
-    artifacts = %w(Account Campaign Lead Contact Opportunity Comment).inject(0) do |sum, asset|
+    artifacts = %w(Account Campaign Lead Contact Opportunity Comment Task).inject(0) do |sum, asset|
       klass = asset.constantize
       sum += klass.assigned_to(self).count if asset != "Comment"
       sum += klass.created_by(self).count
@@ -187,10 +188,6 @@ class User < ActiveRecord::Base
       Ability.new(User.current_user)
     end
 
-    def can_signup?
-      [ :allowed, :needs_approval ].include? Setting.user_signup
-    end
-
   end
 
   ActiveSupport.run_load_hooks(:fat_free_crm_user, self)

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

@@ -1,5 +1,5 @@
 .remote
-  = simple_form_for(@account, :html => one_submit_only(:account), :remote => true) do |f|
+  = simple_form_for(@account, :html => one_submit_only, :remote => true) do |f|
     = link_to_close edit_account_path(@account)
     = f.hidden_field :user_id
 

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

@@ -21,11 +21,11 @@
     –
     %tt
       = account.location << ", " unless account.location.blank?
-      - user_name = account.user_id == current_user.id ? t(:me) : account.user.try(:full_name)
+      - user_name = account.user.try(:full_name)
       - if user_name
-        = t(:added_by, :time_ago => time_ago_in_words(account.created_at), :user => user_name) << " | "
+        = t(:added_by, :time_ago => timeago(account.created_at), :user => h(user_name)).html_safe << " | "
       - else
-        = t(:added_ago, :value => time_ago_in_words(account.created_at)) << " | "
+        = t(:added_ago, :value => timeago(account.created_at)).html_safe << " | "
       = t('pluralize.contact', account.contacts.count) << " | "
       = t('pluralize.opportunity', account.opportunities.count)
 

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

@@ -21,11 +21,11 @@
     –
     %tt
       = account.location << ", " unless account.location.blank?
-      - user_name = account.user_id == current_user.id ? t(:me) : account.user.try(:full_name)
+      - user_name = account.user.try(:full_name)
       - if user_name
-        = t(:added_by, :time_ago => time_ago_in_words(account.created_at), :user => user_name) << " | "
+        = t(:added_by, :time_ago => timeago(account.created_at), :user => h(user_name)).html_safe << " | "
       - else
-        = t(:added_ago, :value => time_ago_in_words(account.created_at)) << " | "
+        = t(:added_ago, :value => timeago(account.created_at)).html_safe << " | "
       = t('pluralize.contact', account.contacts.count) << " | "
       = t('pluralize.opportunity', account.opportunities.count)
 

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

@@ -1,4 +1,4 @@
-= simple_form_for(@account, :html => one_submit_only(:account), :remote => true) do |f|
+= simple_form_for(@account, :html => one_submit_only, :remote => true) do |f|
   = link_to_close new_account_path
   = f.hidden_field :user_id
 

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

@@ -0,0 +1,17 @@
+- entity_name = controller.controller_name.singularize.underscore #account
+- @entity = instance_variable_get("@#{entity_name}")
+- create_id = "create_#{entity_name}" # create_account
+
+- if @entity.valid?
+  jQuery('##{create_id}_arrow').html(crm.COLLAPSED);
+  jQuery('##{create_id}_title').html('#{ j t(entity_name.pluralize) }');
+  jQuery('##{create_id}').slideUp(250);
+  jQuery('##{entity_name.pluralize}').prepend('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+  jQuery('##{dom_id(@entity)}').effect("highlight", { duration:1500 });
+  = refresh_sidebar(:index, :filters)
+  jQuery('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
+  crm.flick('empty', 'remove');
+- else
+  jQuery('##{create_id}').html('#{ j render(:partial => "new") }');
+  jQuery('##{create_id}').effect("shake", { duration:250, distance: 6 });
+  jQuery('#new_#{entity_name} input[type!=hidden]').first().focus();

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

@@ -0,0 +1,6 @@
+- entity_name = controller.controller_name.singularize.underscore
+- @entity = instance_variable_get("@#{entity_name}")
+
+jQuery('##{dom_id(@entity)}').css('background-color', '#ffe4e1').slideUp(250);
+= refresh_sidebar(:index, :filters)
+jQuery('#paginate').replaceWith('#{ j render(:partial => "shared/paginate_with_per_page") }');

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

@@ -0,0 +1,32 @@
+- entity_name = controller.controller_name.singularize.underscore #account
+- @entity = instance_variable_get("@#{entity_name}")
+- id = dom_id(@entity)
+
+- if params[:cancel].true? # <--------------------- Hide [Edit]
+
+  - if called_from_landing_page?
+    crm.flip_form('edit_#{entity_name}');
+    crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
+  - else                                            # Called from index page...
+    jQuery('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+
+- else # <----------------------------------------  Show [Edit] form.
+
+  - if params[:cancel].blank?                       # Called from index page...
+    - if @previous                                  # Hide open [Edit] form if any.
+      - if @previous.is_a?(@entity.class)
+        jQuery('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @previous ]) }');
+      - else
+        crm.flick('#{entity_name}_#{@previous}', 'remove');
+    -# Disable onMouseOver for the list item.
+    crm.highlight_off('#{id}');
+    -# Hide [Create] form if any.
+    crm.hide_form('create_#{entity_name}');
+    -# Show [Edit] form.
+    jQuery('##{id}').html('#{ j render(:partial => "edit") }');
+
+  - elsif params[:cancel].false?                    # Called from title of the landing page...
+    jQuery('#edit_#{entity_name}').html('#{ j render(:partial => "edit") }');
+    crm.flip_form('edit_#{entity_name}');
+    crm.set_title('edit_#{entity_name}', "#{t :edit} #{h @entity.name}");
+  jQuery('#new_#{entity_name} input[type!=hidden]').first().focus();

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

@@ -0,0 +1,11 @@
+- entities = controller.controller_name # accounts
+- @entities = instance_variable_get("@#{entities}")
+
+- if @entities.any?
+  jQuery('##{entities}').html('#{ j render(@entities) }');
+- else
+  jQuery('##{entities}').html('#{ j render(:partial => "shared/empty") }');
+
+jQuery('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
+jQuery('#export').html('#{ j render(:partial => "shared/export") }');
+jQuery('#search_results_count').html('#{ j render(:text => t('search_results_count', :count => @search_results_count)) }');

data/app/views/accounts/index.xls.builder

@@ -3,7 +3,8 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_accounts) do
     unless @accounts.empty?
       # Header.
       xml.Row do
-        heads = [I18n.t('user'),
+        heads = [I18n.t('id'),
+                 I18n.t('user'),
                  I18n.t('assigned_to'),
                  I18n.t('name'),
                  I18n.t('email'),
@@ -24,12 +25,12 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_accounts) do
                  I18n.t('zipcode'),
                  I18n.t('country'),
                  I18n.t('address')]
-        
+
         # Append custom field labels to header
         Account.fields.each do |field|
           heads << field.label
         end
-        
+
         heads.each do |head|
           xml.Cell do
             xml.Data head,
@@ -37,12 +38,13 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_accounts) do
           end
         end
       end
-      
+
       # Account rows.
       @accounts.each do |account|
         xml.Row do
           address = account.billing_address
-          data    = [account.user.try(:name),
+          data    = [account.id,
+                     account.user.try(:name),
                      account.assignee.try(:name),
                      account.name,
                      account.email,
@@ -63,12 +65,12 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_accounts) do
                      address.try(:zipcode),
                      address.try(:country),
                      address.try(:full_address)]
-                     
+
           # Append custom field values.
           Account.fields.each do |field|
             data << account.send(field.name)
           end
-          
+
           data.each do |value|
             xml.Cell do
               xml.Data value,