fat_free_crm 0.13.2 → 0.13.3

data/config/locales/sv-SE_fat_free_crm.yml

@@ -407,6 +407,7 @@ sv-SE:
   task_assigned: Ärendet har tilldelats till %{value}
   task_assigned_to: och tilldelats till %{value}
   task_completed: utfört
+  task_uncomplete: Återställ
   task_completed_ago: utfört %{value} sedan
   task_completed_by: utfört %{time_ago} sedan (%{date}) av %{user}
   task_created: Ärendet har skapats

data/config/locales/th_fat_free_crm.yml

@@ -406,6 +406,7 @@ th:
   task_assigned: ภารกิจได้ถูกมอบหมายให้ %{value}
   task_assigned_to: และได้มอบหมายให้ %{value}
   task_completed: เสร็จสมบูรณ์
+  task_uncomplete: คืนกลับ
   task_completed_by: เสร็จ %{time_ago} ที่ผ่านมา โดย %{user}
   task_completed_ago: เสร็จ %{value} ที่ผ่านมา
   task_created: ภารกิจได้ถูกสร้างขึ้นแล้ว

data/config/locales/zh-CN_fat_free_crm.yml

@@ -413,6 +413,7 @@ zh-CN:
   task_assigned: 任务已经分配给 %{value}
   task_assigned_to: 并分配给 %{value}
   task_completed: 已完成
+  task_uncomplete: 还原
   task_completed_ago: 完成于 %{value} 以前
   task_completed_by: 由 %{user} 完成于 %{time_ago} 以前
   task_created: 任务已被创建

data/config/routes.rb

@@ -32,8 +32,8 @@ Rails.application.routes.draw do
       post :filter
       get  :options
       get  :field_group
-      post :auto_complete
-      post :redraw
+      match :auto_complete
+      get  :redraw
       get  :versions
     end
     member do
@@ -52,8 +52,8 @@ Rails.application.routes.draw do
       post :filter
       get  :options
       get  :field_group
-      post :auto_complete
-      post :redraw
+      match :auto_complete
+      get  :redraw
       get  :versions
     end
     member do
@@ -72,8 +72,8 @@ Rails.application.routes.draw do
       post :filter
       get  :options
       get  :field_group
-      post :auto_complete
-      post :redraw
+      match :auto_complete
+      get  :redraw
       get  :versions
     end
     member do
@@ -91,8 +91,8 @@ Rails.application.routes.draw do
       post :filter
       get  :options
       get  :field_group
-      post :auto_complete
-      post :redraw
+      match :auto_complete
+      get  :redraw
       get  :versions
       get  :autocomplete_account_name
     end
@@ -113,9 +113,9 @@ Rails.application.routes.draw do
       post :filter
       get  :options
       get  :field_group
-      post :auto_complete
-      post :redraw
-      get :versions
+      match :auto_complete
+      get  :redraw
+      get  :versions
     end
     member do
       put  :attach
@@ -129,10 +129,11 @@ Rails.application.routes.draw do
   resources :tasks, :id => /\d+/ do
     collection do
       post :filter
-      post :auto_complete
+      match :auto_complete
     end
     member do
       put  :complete
+      put  :uncomplete
     end
   end
 
@@ -145,8 +146,8 @@ Rails.application.routes.draw do
       post :redraw
     end
     collection do
-      post :auto_complete
       get  :opportunities_overview
+      match :auto_complete
     end
   end
 
@@ -155,7 +156,7 @@ Rails.application.routes.draw do
 
     resources :users do
       collection do
-        post :auto_complete
+        match :auto_complete
       end
       member do
         get :confirm
@@ -175,11 +176,11 @@ Rails.application.routes.draw do
 
     resources :fields do
       collection do
-        post :auto_complete
-        get :options
-        post :redraw
-        post :sort
-        get :subform
+        match :auto_complete
+        get   :options
+        get   :redraw
+        post  :sort
+        get   :subform
       end
     end
 

data/config/settings.default.yml

@@ -66,6 +66,7 @@
 #------------------------------------------------------------------------------
 :smtp:
   :address                    : ""        # e.g. smtp.gmail.com
+  :from                       : ""        # e.g. no-reply@your-domain.com
   :enable_starttls_auto       : true      # true/false
   :port                       : ""        # e.g. 587
   :authentication             : :plain
@@ -258,16 +259,16 @@
   :icon: :fa-tags
   :url:
     :controller: admin/tags
-- :active: false
-  :text: :admin_tab_settings
-  :icon: :fa-cogs
-  :url:
-    :controller: admin/settings
-- :active: false
-  :text: :admin_tab_plugins
-  :icon: :fa-plus-circle
-  :url:
-    :controller: admin/plugins
+#- :active: false
+#  :text: :admin_tab_settings
+#  :icon: :fa-cogs
+#  :url:
+#    :controller: admin/settings
+#- :active: false
+#  :text: :admin_tab_plugins
+#  :icon: :fa-plus-circle
+#  :url:
+#    :controller: admin/plugins
 
 # Account Category. To add custom account type use string value, for example:
 #

data/fat_free_crm.gemspec

@@ -15,11 +15,10 @@ Gem::Specification.new do |gem|
   gem.license = 'MIT'
 
   gem.add_dependency 'rails',               '~> 3.2.12'
-  gem.add_dependency 'prototype-rails'
   gem.add_dependency 'jquery-rails',        '~> 2.1.4' # pegs us to jQuery 1.8
   gem.add_dependency 'select2-rails'
   gem.add_dependency 'simple_form',         '~> 2.0.1'
-  gem.add_dependency 'will_paginate',       '~> 3.0.2'
+  gem.add_dependency 'will_paginate'
   gem.add_dependency 'paperclip'
   # Manually added paperclip gem dependency "cocaine" in order to fix load error: "no such file to load -- cocaine"
   gem.add_dependency 'cocaine'
@@ -28,8 +27,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'acts_as_commentable', '~> 3.0.1'
   gem.add_dependency 'acts-as-taggable-on', '~> 2.3.3'
   gem.add_dependency 'dynamic_form'
-  gem.add_dependency 'haml',                '~> 3'
-  gem.add_dependency 'sass',                '~> 3'
+  gem.add_dependency 'haml'
+  gem.add_dependency 'sass'
   gem.add_dependency 'acts_as_list',        '~> 0.1.4'
   gem.add_dependency 'ffaker',              '>= 1.12.0'
   gem.add_dependency 'cancan'
@@ -40,9 +39,11 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rails3-jquery-autocomplete'
   gem.add_dependency 'valium'
   gem.add_dependency 'psych', '~> 1'        if RUBY_VERSION.to_f < 2.0
+  gem.add_dependency 'thor'
 
   # FatFreeCRM has released it's own versions of the following gems:
   #-----------------------------------------------------------------
   gem.add_dependency 'ransack_ui',          '>= 1.1.0'
+  gem.add_dependency 'ransack',             '1.1.0' # not compatible with 1.2.X yet
   gem.add_dependency 'email_reply_parser_ffcrm'
 end

data/lib/fat_free_crm.rb

@@ -38,7 +38,6 @@ require 'fat_free_crm/load_settings' # register load hook for Setting
 # Require gem dependencies, monkey patches, and vendored plugins (in lib)
 require "fat_free_crm/gem_dependencies"
 require "fat_free_crm/gem_ext"
-require "fat_free_crm/plugin_dependencies"
 
 require "fat_free_crm/custom_fields" # load hooks for Field
 require "fat_free_crm/version"
@@ -57,3 +56,6 @@ require "fat_free_crm/tabs"
 require "fat_free_crm/callback"
 require "fat_free_crm/plugin"
 require "fat_free_crm/view_factory"
+
+require "country_select"
+require "gravatar_image_tag"

data/lib/fat_free_crm/engine.rb

@@ -7,9 +7,7 @@ module FatFreeCRM
   class Engine < ::Rails::Engine
     config.autoload_paths += Dir[root.join("app/models/**")] +
                              Dir[root.join("app/controllers/entities")]
-
-    config.to_prepare do
-      ActiveRecord::Base.observers = :lead_observer, :opportunity_observer, :task_observer
-    end
+    config.active_record.observers = [:lead_observer, :opportunity_observer,
+                                      :task_observer, :entity_observer]
   end
 end

data/lib/fat_free_crm/gem_dependencies.rb

@@ -6,7 +6,6 @@
 require 'rails/all'
 require 'jquery-rails'
 require 'select2-rails'
-require 'prototype-rails'
 require 'haml'
 require 'sass'
 require 'acts_as_commentable'
@@ -28,6 +27,7 @@ require 'ffaker'
 require 'premailer'
 require 'nokogiri'
 require 'font-awesome-rails'
+require 'thor'
 
 # Load redcloth if available (for textile markup in emails)
 begin

data/lib/fat_free_crm/gem_ext.rb

@@ -6,8 +6,6 @@
 require "fat_free_crm/gem_ext/rails/text_helper"
 require "fat_free_crm/gem_ext/active_record/schema_dumper"
 require "fat_free_crm/gem_ext/active_support/buffered_logger"
-require "fat_free_crm/gem_ext/active_model/serializers/xml/serializer/attribute"
 require "fat_free_crm/gem_ext/action_controller/base"
-require "fat_free_crm/gem_ext/authlogic/session/cookies"
 require "fat_free_crm/gem_ext/simple_form/action_view_extensions/form_helper"
 require "fat_free_crm/gem_ext/rake/task" if defined?(Rake)

data/lib/fat_free_crm/permissions.rb

@@ -44,7 +44,6 @@ module FatFreeCRM
             if access != "Shared"
               remove_permissions
             else
-              value.map!{|c| c.split(',')} if value.map{|v| v.to_s.include?(',')}.any? # fix for a bug in "Chosen" which gives values like ["", "1,2,3"] 
               value = value.flatten.reject(&:blank?).uniq.map(&:to_i)
               permissions_to_remove = Permission.find_all_by_#{model}_id_and_asset_id_and_asset_type(self.#{model}_ids - value, self.id, self.class)
               permissions_to_remove.each {|p| (permissions.delete(p); p.destroy)}
@@ -57,7 +56,7 @@ module FatFreeCRM
           end
         }
       end
-      
+
       # Remove all shared permissions if no longer shared
       #--------------------------------------------------------------------------
       def access=(value)
@@ -95,7 +94,7 @@ module FatFreeCRM
         self.group_ids = model.group_ids
         save
       end
-      
+
     end
 
     module SingletonMethods

data/lib/fat_free_crm/version.rb

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

data/lib/tasks/ffcrm/settings.rake

@@ -5,30 +5,18 @@
 #------------------------------------------------------------------------------
 namespace :ffcrm do
   namespace :settings do
-  
+
     desc "Clear settings from database (reset to default)"
     task :clear => :environment do
-      puts "== Clearing settings table..."
-
-      # Truncate settings table
-      ActiveRecord::Base.establish_connection(Rails.env)
-      if ActiveRecord::Base.connection.adapter_name.downcase == "sqlite"
-        ActiveRecord::Base.connection.execute("DELETE FROM settings")
-      else # mysql and postgres
-        ActiveRecord::Base.connection.execute("TRUNCATE settings")
-      end
-
-      puts "===== Settings table has been cleared."
+      Setting.delete_all
     end
 
     desc "Show current settings in the database"
     task :show => :environment do
-      ActiveRecord::Base.establish_connection(Rails.env)
-      names = ActiveRecord::Base.connection.select_values("SELECT name FROM settings ORDER BY name")
-      names.each do |name|
+      Setting.select('name').order('name').pluck('name').each do |name|
         puts "\n#{name}:\n  #{Setting.send(name).inspect}"
       end
     end
-    
+
   end
 end

data/spec/controllers/entities/accounts_controller_spec.rb

@@ -566,18 +566,18 @@ describe AccountsController do
     it_should_behave_like("auto complete")
   end
 
-  # POST /accounts/redraw                                                 AJAX
+  # GET  /accounts/redraw                                                 AJAX
   #----------------------------------------------------------------------------
-  describe "responding to POST redraw" do
+  describe "responding to GET redraw" do
     it "should save user selected account preference" do
-      xhr :post, :redraw, :per_page => 42, :view => "brief", :sort_by => "name"
+      xhr :get, :redraw, :per_page => 42, :view => "brief", :sort_by => "name"
       current_user.preference[:accounts_per_page].should == "42"
       current_user.preference[:accounts_index_view].should  == "brief"
       current_user.preference[:accounts_sort_by].should  == "accounts.name ASC"
     end
 
     it "should reset current page to 1" do
-      xhr :post, :redraw, :per_page => 42, :view => "brief", :sort_by => "name"
+      xhr :get, :redraw, :per_page => 42, :view => "brief", :sort_by => "name"
       session[:accounts_current_page].should == 1
     end
 
@@ -587,7 +587,7 @@ describe AccountsController do
         FactoryGirl.create(:account, :name => "B", :user => current_user)
       ]
 
-      xhr :post, :redraw, :per_page => 1, :sort_by => "name"
+      xhr :get, :redraw, :per_page => 1, :sort_by => "name"
       assigns(:accounts).should == [ @accounts.first ]
       response.should render_template("accounts/index")
     end

data/spec/controllers/entities/campaigns_controller_spec.rb

@@ -605,18 +605,18 @@ describe CampaignsController do
     it_should_behave_like("auto complete")
   end
 
-  # POST /campaigns/redraw                                                 AJAX
+  # GET  /campaigns/redraw                                                 AJAX
   #----------------------------------------------------------------------------
-  describe "responding to POST redraw" do
+  describe "responding to GET redraw" do
     it "should save user selected campaign preference" do
-      xhr :post, :redraw, :per_page => 42, :view => "brief", :sort_by => "name"
+      xhr :get, :redraw, :per_page => 42, :view => "brief", :sort_by => "name"
       current_user.preference[:campaigns_per_page].should == "42"
       current_user.preference[:campaigns_index_view].should  == "brief"
       current_user.preference[:campaigns_sort_by].should  == "campaigns.name ASC"
     end
 
     it "should reset current page to 1" do
-      xhr :post, :redraw, :per_page => 42, :view => "brief", :sort_by => "name"
+      xhr :get, :redraw, :per_page => 42, :view => "brief", :sort_by => "name"
       session[:campaigns_current_page].should == 1
     end
 
@@ -626,7 +626,7 @@ describe CampaignsController do
         FactoryGirl.create(:campaign, :name => "B", :user => current_user)
       ]
 
-      xhr :post, :redraw, :per_page => 1, :sort_by => "name"
+      xhr :get, :redraw, :per_page => 1, :sort_by => "name"
       assigns(:campaigns).should == [ @campaigns.first ]
       response.should render_template("campaigns/index")
     end

data/spec/controllers/entities/contacts_controller_spec.rb

@@ -216,6 +216,43 @@ describe ContactsController do
     end
   end
 
+  # GET /contacts/field_group                                              AJAX
+  #----------------------------------------------------------------------------
+  describe "responding to GET field_group" do
+
+    context "with an existing tag" do
+      before :each do
+        @tag = FactoryGirl.create(:tag)
+      end
+
+      it "should return with an existing tag name" do
+        xhr :get, :field_group, {:tag => @tag.name}
+        assigns[:tag].name == @tag.name
+      end
+
+      it "should have the same count of tags" do
+        xhr :get, :field_group, {:tag =>  @tag.name}
+        Tag.count.should equal(1)
+      end
+
+    end
+
+    context "without an existing tag" do
+      it "should not find a tag" do
+        tag_name = "New-Tag"
+        xhr :get, :field_group, {:tag => tag_name}
+        assigns[:tag].should eql(nil)
+      end
+
+      it "should have the same count of tags" do
+        tag_name = "New-Tag-1"
+        xhr :get, :field_group, {:tag => tag_name}
+        Tag.count.should equal(0)
+      end
+    end
+
+  end
+
   # GET /contacts/1/edit                                                   AJAX
   #----------------------------------------------------------------------------
   describe "responding to GET edit" do
@@ -648,11 +685,11 @@ describe ContactsController do
     it_should_behave_like("auto complete")
   end
 
-  # POST /contacts/redraw                                                  AJAX
+  # GET /contacts/redraw                                                   AJAX
   #----------------------------------------------------------------------------
   describe "responding to POST redraw" do
     it "should save user selected contact preference" do
-      xhr :post, :redraw, :per_page => 42, :view => "long", :sort_by => "first_name", :naming => "after"
+      xhr :get, :redraw, :per_page => 42, :view => "long", :sort_by => "first_name", :naming => "after"
       current_user.preference[:contacts_per_page].to_i.should == 42
       current_user.preference[:contacts_index_view].should  == "long"
       current_user.preference[:contacts_sort_by].should  == "contacts.first_name ASC"
@@ -660,13 +697,13 @@ describe ContactsController do
     end
 
     it "should set similar options for Leads" do
-      xhr :post, :redraw, :sort_by => "first_name", :naming => "after"
+      xhr :get, :redraw, :sort_by => "first_name", :naming => "after"
       current_user.pref[:leads_sort_by].should == "leads.first_name ASC"
       current_user.pref[:leads_naming].should == "after"
     end
 
     it "should reset current page to 1" do
-      xhr :post, :redraw, :per_page => 42, :view => "long", :sort_by => "first_name", :naming => "after"
+      xhr :get, :redraw, :per_page => 42, :view => "long", :sort_by => "first_name", :naming => "after"
       session[:contacts_current_page].should == 1
     end
 
@@ -676,7 +713,7 @@ describe ContactsController do
         FactoryGirl.create(:contact, :first_name => "Bobby", :user => current_user)
       ]
 
-      xhr :post, :redraw, :per_page => 1, :sort_by => "first_name"
+      xhr :get, :redraw, :per_page => 1, :sort_by => "first_name"
       assigns(:contacts).should == [ @contacts.first ]
       response.should render_template("contacts/index")
     end