fat_free_crm 0.11.3 → 0.11.4

data/config/settings.default.yml

@@ -49,7 +49,7 @@
 # incoming request, so you’ll need to provide all of the details needed to
 # generate a URL.
 #
-# :host: "http://www.example.com"
+# :host: "www.example.com"
 #
 :host: ""
 
@@ -84,6 +84,7 @@
   :authentication             : :plain
   :user_name                  : ""
   :password                   : ""
+#  :delivery_method            : :smtp   # This is the default. Can be :smtp, :sendmail, :test, :file
 
 
 # Settings for the Email dropbox (IMAP)
@@ -174,18 +175,8 @@
 #
 :require_last_names: true
 
-
-# Beta features
-#------------------------------------------------------------------------------
-# These are features that need to be in the master branch due to extensive codebase changes,
-# but are disabled by default until ready for general use.
-
-# - Ransack advanced search
-:advanced_search_enabled: false
-
-# - PaperTrail history UI
-:paper_trail_ui_enabled: false
-
+# Show comments on dashboard
+:comments_visible_on_dashboard: false
 
 # Background information
 #------------------------------------------------------------------------------
@@ -207,21 +198,30 @@
 #
 :background_info: []
 
+# Priority countries
+#------------------------------------------------------------------------------
+# Specify which countries (if any) should appear at the top of country pickers
+# priority_countries:
+#  - Burkina Faso
 
 # Main and Admin Tabs
 #------------------------------------------------------------------------------
 :tabs: [
-  { :active : true,  :text : :tab_dashboard,     :url : { :controller : "home"           } },
-  { :active : false, :text : :tab_tasks,         :url : { :controller : "tasks"          } },
-  { :active : false, :text : :tab_campaigns,     :url : { :controller : "campaigns"      } },
-  { :active : false, :text : :tab_leads,         :url : { :controller : "leads"          } },
-  { :active : false, :text : :tab_accounts,      :url : { :controller : "accounts"       } },
-  { :active : false, :text : :tab_contacts,      :url : { :controller : "contacts"       } },
-  { :active : false, :text : :tab_opportunities, :url : { :controller : "opportunities"  } }
+  { :active : true,  :text : :tab_dashboard,     :url : { :controller : "home"                   } },
+  { :active : false, :text : :tab_tasks,         :url : { :controller : "tasks"                  } },
+  { :active : false, :text : :tab_campaigns,     :url : { :controller : "campaigns"              } },
+  { :active : false, :text : :tab_leads,         :url : { :controller : "leads"                  } },
+  { :active : false, :text : :tab_accounts,      :url : { :controller : "accounts"               } },
+  { :active : false, :text : :tab_contacts,      :url : { :controller : "contacts"               } },
+  { :active : false, :text : :tab_opportunities, :url : { :controller : "opportunities"          } },
+  { :active : false, :text : :tab_team,          :url : { :controller : "users",
+                                                          :action :     "opportunities_overview" } }
+
 ]
 
 :admin_tabs: [
   { :active : true,  :text : :admin_tab_users,    :url : { :controller : "admin/users"    } },
+  { :active : true,  :text : :admin_tab_groups,   :url : { :controller : "admin/groups"   } },
   { :active : false, :text : :admin_tab_fields,   :url : { :controller : "admin/fields"   } },
   { :active : false, :text : :admin_tab_tags,     :url : { :controller : "admin/tags"     } },
   { :active : false, :text : :admin_tab_settings, :url : { :controller : "admin/settings" } },

data/db/demo/addresses.yml

@@ -37,10 +37,10 @@ address_<%= i %>:
   city             : <%= city    = Faker::Address.city %>
   state            : <%= state   = Faker::Address.us_state_abbr %>
   zipcode          : <%= zipcode = Faker::Address.zip_code %>
-  country          : USA
+  country          : US
   full_address     : |
                       <%= street1 %>
                       <%= street2 %>
                       <%= "#{city}, #{state} #{zipcode}" %>
-                      USA
+                      US
 <% end %>

data/db/migrate/20100928030598_create_sessions.rb

@@ -1,5 +1,10 @@
 class CreateSessions < ActiveRecord::Migration
   def self.up
+    # Set the following global variable to show that we are migrating
+    # from a brand new database. Future migrations can detect this, and
+    # avoid running unnecessary code.
+    $FFCRM_NEW_DATABASE = true
+
     create_table :sessions do |t|
       t.string :session_id, :null => false
       t.text :data

data/db/migrate/20100928030627_acts_as_taggable_on_migration.rb

@@ -5,15 +5,15 @@ class ActsAsTaggableOnMigration < ActiveRecord::Migration
     end
 
     create_table :taggings do |t|
-      t.column :tag_id, :integer
-      t.column :taggable_id, :integer
-      t.column :tagger_id, :integer
-      t.column :tagger_type, :string
+      t.integer :tag_id
+      t.integer :taggable_id
+      t.integer :tagger_id
+      t.string :tagger_type
 
       # You should make sure that the column created is
       # long enough to store the required class names.
-      t.column :taggable_type, :string
-      t.column :context, :string
+      t.string :taggable_type, :limit => 50
+      t.string :context, :limit => 50
 
       t.column :created_at, :datetime
     end

data/db/migrate/20111201030535_add_field_groups_klass_name.rb

@@ -3,7 +3,8 @@ class AddFieldGroupsKlassName < ActiveRecord::Migration
     add_column :field_groups, :klass_name, :string, :limit => 32
 
     # Add a default field group for each model
-    Field::KLASSES.each do |klass|
+    %w(Account Campaign Contact Lead Opportunity).each do |entity|
+      klass = entity.classify.constantize
       field_group = FieldGroup.new
       field_group.label, field_group.klass_name = 'Custom Fields', klass.name
       field_group.save!

data/db/migrate/20120406082136_create_groups.rb

@@ -0,0 +1,19 @@
+class CreateGroups < ActiveRecord::Migration
+  def change
+    create_table :groups do |t|
+      t.string :name
+      t.timestamps
+    end
+
+    add_column :permissions, :group_id, :integer
+    add_index :permissions, :group_id
+
+    create_table :groups_users, :id => false do |t|
+      t.references :group
+      t.references :user
+    end
+    add_index :groups_users, :group_id
+    add_index :groups_users, :user_id
+    add_index :groups_users, [:group_id, :user_id]
+  end
+end

data/db/migrate/20120510025219_add_not_null_constraints_for_timestamp_columns.rb

@@ -0,0 +1,21 @@
+class AddNotNullConstraintsForTimestampColumns < ActiveRecord::Migration
+  def up
+    set_timestamp_constraints :null => false unless $FFCRM_NEW_DATABASE
+  end
+
+  def down
+    set_timestamp_constraints {} unless $FFCRM_NEW_DATABASE
+  end
+
+  private
+  def set_timestamp_constraints(constraints)
+    ActiveRecord::Base.connection.tables.each do |table|
+      # If table has both timestamp columns, set not null constraints on both columns.
+      if [:created_at, :updated_at].all? { |column| column_exists?(table, column) }
+        [:created_at, :updated_at].each do |column|
+          change_column table, column, :datetime, constraints
+        end
+      end
+    end
+  end
+end

data/db/migrate/20120528102124_increase_length_of_version_events.rb

@@ -0,0 +1,9 @@
+class IncreaseLengthOfVersionEvents < ActiveRecord::Migration
+  def up
+    change_column :versions, :event, :string, :limit => 512
+  end
+
+  def down
+    change_column :versions, :event, :string, :limit => 255
+  end
+end

data/db/migrate/20120801032706_add_pair_id_to_fields.rb

@@ -0,0 +1,5 @@
+class AddPairIdToFields < ActiveRecord::Migration
+  def change
+    add_column :fields, :pair_id, :integer
+  end
+end

data/db/migrate/20121003063155_add_settings_to_custom_fields.rb

@@ -0,0 +1,5 @@
+class AddSettingsToCustomFields < ActiveRecord::Migration
+  def change
+    add_column :fields, :settings, :text, :default => nil
+  end
+end

data/db/migrate/20121221033947_fix_country_mapping.rb

@@ -0,0 +1,32 @@
+class FixCountryMapping < ActiveRecord::Migration
+  def up
+    message = """ Important note about countries. Please read carefully!
+
+The country mapping in lib/plugins/country_select/lib/country_select.rb
+was found to be wrong. E.g. Australia was originally mapped to AS, which is
+officially the ISO code for American Samoa. (This is just one example!)
+From this point on, it will be mapped to AU, the correct ISO code for Australia.
+It is critical that you run 'rake ffcrm:update_data:fix_countries' to fix your address data.
+
+However, please note, this task should only ever be run ONCE!
+
+If you run it multiple times on the same database then you will mess up your existing
+address data. E.g. running once will map AS -> AU (Australia) and AU -> AT (Austria). If you run
+that again, it will map all Australian countries to Austria!! (...and so on for all the
+other mappings that have changed.)
+
+Your database settings indicate that you have not run this task before.
+Please BACK UP YOUR DATA and then run 'rake ffcrm:update_data:fix_countries'
+before continuing any further.
+
+This message will self-destruct in 10 seconds...
+
+"""
+
+    puts message unless Setting.have_run_country_migration
+  
+  end
+
+  def down
+  end
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120413034923) do
+ActiveRecord::Schema.define(:version => 20121221033947) do
 
   create_table "account_contacts", :force => true do |t|
     t.integer  "account_id"
@@ -222,11 +222,28 @@ ActiveRecord::Schema.define(:version => 20120413034923) do
     t.integer  "maxlength"
     t.datetime "created_at",                    :null => false
     t.datetime "updated_at",                    :null => false
+    t.integer  "pair_id"
+    t.text     "settings"
   end
 
   add_index "fields", ["field_group_id"], :name => "index_fields_on_field_group_id"
   add_index "fields", ["name"], :name => "index_fields_on_name"
 
+  create_table "groups", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "groups_users", :id => false, :force => true do |t|
+    t.integer "group_id"
+    t.integer "user_id"
+  end
+
+  add_index "groups_users", ["group_id", "user_id"], :name => "index_groups_users_on_group_id_and_user_id"
+  add_index "groups_users", ["group_id"], :name => "index_groups_users_on_group_id"
+  add_index "groups_users", ["user_id"], :name => "index_groups_users_on_user_id"
+
   create_table "leads", :force => true do |t|
     t.integer  "user_id"
     t.integer  "campaign_id"
@@ -295,9 +312,11 @@ ActiveRecord::Schema.define(:version => 20120413034923) do
     t.string   "asset_type"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
+    t.integer  "group_id"
   end
 
   add_index "permissions", ["asset_id", "asset_type"], :name => "index_permissions_on_asset_id_and_asset_type"
+  add_index "permissions", ["group_id"], :name => "index_permissions_on_group_id"
   add_index "permissions", ["user_id"], :name => "index_permissions_on_user_id"
 
   create_table "preferences", :force => true do |t|
@@ -334,8 +353,8 @@ ActiveRecord::Schema.define(:version => 20120413034923) do
     t.integer  "taggable_id"
     t.integer  "tagger_id"
     t.string   "tagger_type"
-    t.string   "taggable_type"
-    t.string   "context"
+    t.string   "taggable_type", :limit => 50
+    t.string   "context",       :limit => 50
     t.datetime "created_at"
   end
 
@@ -407,9 +426,9 @@ ActiveRecord::Schema.define(:version => 20120413034923) do
   add_index "users", ["username", "deleted_at"], :name => "index_users_on_username_and_deleted_at", :unique => true
 
   create_table "versions", :force => true do |t|
-    t.string   "item_type",      :null => false
-    t.integer  "item_id",        :null => false
-    t.string   "event",          :null => false
+    t.string   "item_type",                     :null => false
+    t.integer  "item_id",                       :null => false
+    t.string   "event",          :limit => 512, :null => false
     t.string   "whodunnit"
     t.text     "object"
     t.datetime "created_at"

data/fat_free_crm.gemspec

@@ -8,36 +8,39 @@ Gem::Specification.new do |gem|
   gem.summary = 'Fat Free CRM'
   gem.description = 'An open source, Ruby on Rails customer relationship management platform'
   gem.homepage = 'http://fatfreecrm.com'
-  gem.email = ['mike@fatfreecrm.com', 'nathan@fatfreecrm.com', 'warp@fatfreecrm.com']
+  gem.email = ['mike@fatfreecrm.com', 'nathan@fatfreecrm.com', 'warp@fatfreecrm.com', 'steveyken@gmail.com']
   gem.files = `git ls-files`.split("\n")
   gem.version = FatFreeCRM::VERSION::STRING
 
-  gem.add_dependency 'rails',               '~> 3.2.2'
+  gem.add_dependency 'rails',               '~> 3.2'
   gem.add_dependency 'prototype-rails'
   gem.add_dependency 'jquery-rails'
+  gem.add_dependency 'select2-rails'
   gem.add_dependency 'simple_form',         '~> 2.0.1'
   gem.add_dependency 'will_paginate',       '~> 3.0.2'
-  gem.add_dependency 'paperclip',           '~> 2.7.0'
+  gem.add_dependency 'paperclip',           '~> 2.8.0'
+  # Manually added paperclip gem dependency "cocaine" in order to fix load error: "no such file to load -- cocaine"
+  gem.add_dependency 'cocaine'
   gem.add_dependency 'paper_trail'
-  gem.add_dependency 'authlogic',           '~> 3.1.0'
+  gem.add_dependency 'authlogic',           '3.1.0'
   gem.add_dependency 'acts_as_commentable', '~> 3.0.1'
-  gem.add_dependency 'acts-as-taggable-on', '~> 2.2.1'
+  gem.add_dependency 'acts-as-taggable-on', '~> 2.3.3'
   gem.add_dependency 'dynamic_form'
-  gem.add_dependency 'haml',                '~> 3.1.3'
-  gem.add_dependency 'sass',                '~> 3.1.10'
+  gem.add_dependency 'haml',                '~> 3'
+  gem.add_dependency 'sass',                '~> 3'
   gem.add_dependency 'acts_as_list',        '~> 0.1.4'
   gem.add_dependency 'ffaker',              '>= 1.12.0'
   gem.add_dependency 'cancan'
   gem.add_dependency 'premailer'
   gem.add_dependency 'nokogiri'
-  gem.add_dependency 'squeel',              '~> 0.9.3'
+  gem.add_dependency 'responds_to_parent',  '>= 1.1.0'
+  gem.add_dependency 'rails3-jquery-autocomplete'
+  gem.add_dependency 'valium'
 
   # FatFreeCRM has released it's own versions of the following gems:
   #-----------------------------------------------------------------
-  gem.add_dependency 'ransack_ffcrm',       '~> 0.6.0'
-  gem.add_dependency 'chosen-rails_ffcrm'
-  gem.add_dependency 'ajax-chosen-rails',   '>= 0.2.0'  # (now depends on chosen-rails_ffcrm)
-  gem.add_dependency 'responds_to_parent_ffcrm'
+  gem.add_dependency 'ransack_ffcrm',       '~> 0.7.1'
+  gem.add_dependency 'ransack_ui',          '>= 1.0.2'
+  gem.add_dependency 'ajax-chosen-rails',   '>= 0.2.1'  # (now depends on chosen-rails_ffcrm)
   gem.add_dependency 'email_reply_parser_ffcrm'
-
 end

data/lib/fat_free_crm.rb

@@ -44,6 +44,7 @@ require "fat_free_crm/plugin_dependencies"
 
 require "fat_free_crm/version"
 require "fat_free_crm/core_ext"
+require "fat_free_crm/comment_extensions"
 require "fat_free_crm/exceptions"
 require "fat_free_crm/errors"
 require "fat_free_crm/i18n"
@@ -55,3 +56,4 @@ require "fat_free_crm/sortable"
 require "fat_free_crm/tabs"
 require "fat_free_crm/callback"
 require "fat_free_crm/plugin"
+require "fat_free_crm/view_factory"

data/lib/fat_free_crm/comment_extensions.rb

@@ -0,0 +1,23 @@
+module FatFreeCRM
+  module CommentExtensions
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def uses_comment_extensions
+        unless included_modules.include?(InstanceMethods)
+          include FatFreeCRM::CommentExtensions::InstanceMethods
+        end
+      end
+    end
+
+    module InstanceMethods
+      def add_comment_by_user(comment_body, user)
+        comments.create(:comment => comment_body, :user => user) if comment_body.present?
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send(:include, FatFreeCRM::CommentExtensions)

data/lib/fat_free_crm/core_ext/array.rb

@@ -58,11 +58,17 @@ class Array
 
     klass = first.class
     columns = klass.columns.map(&:name).reject { |column| column =~ /password|token/ }
-
+    columns << 'tags'
     CSV.generate do |csv|
       csv << columns.map { |column| klass.human_attribute_name(column) }
       each do |item|
-        csv << columns.map { |column| item.send(column) }
+        csv << columns.map do |column|
+          if column == 'tags'
+            item.tag_list.join(' ')
+          else
+            item.send(column)
+          end
+        end
       end
     end
   end

data/lib/fat_free_crm/fields.rb

@@ -27,18 +27,33 @@ module FatFreeCRM
         unless included_modules.include?(InstanceMethods)
           extend SingletonMethods
           include InstanceMethods
+          serialize_custom_fields!
+          validate :custom_fields_validator
         end
       end
     end
 
     module SingletonMethods
       def field_groups
-        FieldGroup.where(:klass_name => self.name).order(:position)
+        if ActiveRecord::Base.connection.table_exists? 'field_groups'
+          FieldGroup.where(:klass_name => self.name).order(:position)
+        else
+          []
+        end
       end
 
       def fields
         field_groups.map(&:fields).flatten
       end
+      
+      def serialize_custom_fields!
+        fields.each do |field|
+          if !serialized_attributes.keys.include?(field.name) and field.as == 'check_boxes'
+            serialize(field.name.to_sym, Array)
+          end
+        end
+      end
+
     end
 
     module InstanceMethods
@@ -46,6 +61,12 @@ module FatFreeCRM
         field_groups = self.class.field_groups
         respond_to?(:tag_ids) ? field_groups.with_tags(tag_ids) : field_groups
       end
+      
+      # run custom field validations on this object
+      #------------------------------------------------------------------------------
+      def custom_fields_validator
+        self.field_groups.map(&:fields).flatten.each{|f| f.custom_validator(self) }
+      end
 
       def assign_attributes(new_attributes, options = {})
         super
@@ -62,6 +83,8 @@ module FatFreeCRM
           self.class.reset_column_information
           # If new record, create new object from class, else reload class
           object = self.new_record? ? self.class.new : (self.reload && self)
+          # ensure serialization is setup if needed
+          self.class.serialize_custom_fields!
           # Try again if object now responds to method, else return nil
           object.respond_to?(method_id) ? object.send(method_id, *args) : nil
         else
@@ -73,4 +96,3 @@ module FatFreeCRM
 end
 
 ActiveRecord::Base.send(:include, FatFreeCRM::Fields)
-