fat_free_crm 0.18.2 → 0.19.0

data/Procfile

@@ -1 +1 @@
-web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
+web: bundle exec puma -C config/puma.rb

data/README.md

@@ -84,7 +84,7 @@ This is the best way to deploy Fat Free CRM if you need to add plugins or make a
 
 ## Upgrading from previous versions of Fat Free CRM
 
-Please read the [Release Notes](https://github.com/fatfreecrm/fat_free_crm/blob/master/CHANGELOG.md) document for more detailed information on upgrading from previous versions.
+Please read the [Changelog](https://github.com/fatfreecrm/fat_free_crm/blob/master/CHANGELOG.md) document for more detailed information on upgrading from previous versions.
 
 
 ## Resources
@@ -122,7 +122,7 @@ Tests can easily be run by typing 'rake' but please note that they do take a whi
 * steveyken
 
 
-See the [contributors graph](https://github.com/fatfreecrm/fat_free_crm/graphs/contributors) and the [contributors file](https://github.com/fatfreecrm/fat_free_crm/blob/master/CONTRIBUTORS) for further details.
+See the [contributors graph](https://github.com/fatfreecrm/fat_free_crm/graphs/contributors) and the [contributors file](https://github.com/fatfreecrm/fat_free_crm/blob/master/CONTRIBUTORS.md) for further details.
 
 ## License
 

data/Rakefile

@@ -4,7 +4,7 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('config/application', __dir__)
 
 FatFreeCRM::Application.load_tasks
 

data/app/assets/stylesheets/common.scss

@@ -89,7 +89,7 @@ $sidebar_width: 210px;
   -moz-box-shadow: 5px 5px 15px #bbbbbb, -5px 0px 15px #bbbbbb;
   -webkit-border-radius: 6px;
   -webkit-box-shadow: 5px 5px 15px #bbbbbb, -5px 0px 15px #bbbbbb;
-  input[type="text"], input[type="password"] {
+  input[type="text"], input[type="email"], input[type="password"] {
     font-size: 16px;
     padding: 2px;
     width: 355px; }

data/app/controllers/admin/application_controller.rb

@@ -23,7 +23,7 @@ class Admin::ApplicationController < ApplicationController
 
   #----------------------------------------------------------------------------
   def require_admin_user
-    require_user
+    authenticate_user!
     unless current_user&.admin?
       flash[:notice] = t(:msg_require_admin)
       redirect_to root_path

data/app/controllers/admin/field_groups_controller.rb

@@ -22,9 +22,7 @@ class Admin::FieldGroupsController < Admin::ApplicationController
   def edit
     @field_group = FieldGroup.find(params[:id])
 
-    if params[:previous].to_s =~ /(\d+)\z/
-      @previous = FieldGroup.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
-    end
+    @previous = FieldGroup.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
 
     respond_with(@field_group)
   end

data/app/controllers/admin/tags_controller.rb

@@ -28,9 +28,7 @@ class Admin::TagsController < Admin::ApplicationController
   # GET /admin/tags/1/edit                                                AJAX
   #----------------------------------------------------------------------------
   def edit
-    if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Tag.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
-    end
+    @previous = Tag.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
   end
 
   # POST /admin/tags

data/app/controllers/admin/users_controller.rb

@@ -35,9 +35,7 @@ class Admin::UsersController < Admin::ApplicationController
   # GET /admin/users/1/edit                                                AJAX
   #----------------------------------------------------------------------------
   def edit
-    if params[:previous].to_s =~ /(\d+)\z/
-      @previous = User.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
-    end
+    @previous = User.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
 
     respond_with(@user)
   end
@@ -48,7 +46,7 @@ class Admin::UsersController < Admin::ApplicationController
   def create
     @user = User.new(user_params)
     @user.suspend_if_needs_approval
-    @user.save_without_session_maintenance
+    @user.save
 
     respond_with(@user)
   end
@@ -59,7 +57,7 @@ class Admin::UsersController < Admin::ApplicationController
   def update
     @user = User.find(params[:id])
     @user.attributes = user_params
-    @user.save_without_session_maintenance
+    @user.save
 
     respond_with(@user)
   end
@@ -74,9 +72,7 @@ class Admin::UsersController < Admin::ApplicationController
   # DELETE /admin/users/1.xml                                              AJAX
   #----------------------------------------------------------------------------
   def destroy
-    unless @user.destroyable?(current_user) && @user.destroy
-      flash[:warning] = t(:msg_cant_delete_user, @user.full_name)
-    end
+    flash[:warning] = t(:msg_cant_delete_user, @user.full_name) unless @user.destroyable?(current_user) && @user.destroy
 
     respond_with(@user)
   end
@@ -107,6 +103,7 @@ class Admin::UsersController < Admin::ApplicationController
 
   def user_params
     return {} unless params[:user]
+
     params[:user][:email].try(:strip!)
     params[:user][:password_confirmation] = nil if params[:user][:password_confirmation].blank?
 

data/app/controllers/application_controller.rb

@@ -8,8 +8,9 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
+  before_action :configure_devise_parameters, if: :devise_controller?
+  before_action :authenticate_user!
   before_action :set_paper_trail_whodunnit
-
   before_action :set_context
   before_action :clear_setting_cache
   before_action :cors_preflight_check
@@ -17,7 +18,6 @@ class ApplicationController < ActionController::Base
   after_action { hook(:app_after_filter, self) }
   after_action :cors_set_access_control_headers
 
-  helper_method :current_user_session, :current_user, :can_signup?
   helper_method :called_from_index_page?, :called_from_landing_page?
   helper_method :klass
 
@@ -73,16 +73,17 @@ class ApplicationController < ActionController::Base
   end
 
   #
-  # Takes { :related => 'campaigns/7' } or { :related => '5' }
+  # Takes { related: 'campaigns/7' } or { related: '5' }
   #   and returns array of object ids that should be excluded from search
   #   assumes controller_name is a method on 'related' class that returns a collection
   #----------------------------------------------------------------------------
   def auto_complete_ids_to_exclude(related)
     return [] if related.blank?
     return [related.to_i].compact unless related.index('/')
+
     related_class, id = related.split('/')
     obj = related_class.classify.constantize.find_by_id(id)
-    if obj && obj.respond_to?(controller_name)
+    if obj&.respond_to?(controller_name)
       obj.send(controller_name).map(&:id)
     else
       []
@@ -114,47 +115,6 @@ class ApplicationController < ActionController::Base
     @current_tab = tab
   end
 
-  #----------------------------------------------------------------------------
-  def current_user_session
-    @current_user_session ||= Authentication.find
-    @current_user_session = nil if @current_user_session&.record&.suspended?
-    @current_user_session
-  end
-
-  #----------------------------------------------------------------------------
-  def current_user
-    unless @current_user
-      @current_user = (current_user_session&.record)
-      if @current_user
-        @current_user.set_individual_locale
-        @current_user.set_single_access_token
-      end
-      User.current_user = @current_user
-    end
-    @current_user
-  end
-
-  #----------------------------------------------------------------------------
-  def require_user
-    unless current_user
-      store_location
-      flash[:notice] = t(:msg_login_needed) if request.fullpath != "/"
-      respond_to do |format|
-        format.html { redirect_to login_url }
-        format.js   { render plain: "window.location = '#{login_url}';" }
-      end
-    end
-  end
-
-  #----------------------------------------------------------------------------
-  def require_no_user
-    if current_user
-      store_location
-      flash[:notice] = t(:msg_logout_needed)
-      redirect_to profile_url
-    end
-  end
-
   #----------------------------------------------------------------------------
   def store_location
     session[:return_to] = request.fullpath
@@ -282,6 +242,12 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def configure_devise_parameters
+    devise_parameter_sanitizer.permit(:sign_up) do |user_params|
+      user_params.permit(:username, :email, :password, :password_confirmation)
+    end
+  end
+
   def find_class(asset)
     Rails.application.eager_load! unless Rails.application.config.cache_classes
     classes = ActiveRecord::Base.descendants.map(&:name)

data/app/controllers/comments_controller.rb

@@ -6,8 +6,6 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class CommentsController < ApplicationController
-  before_action :require_user
-
   # GET /comments
   # GET /comments.json
   # GET /comments.xml
@@ -37,9 +35,7 @@ class CommentsController < ApplicationController
 
     model = find_class(@comment.commentable_type)
     id = @comment.commentable_id
-    unless model.my(current_user).find_by_id(id)
-      respond_to_related_not_found(model.downcase)
-    end
+    respond_to_related_not_found(model.downcase) unless model.my(current_user).find_by_id(id)
   end
 
   # POST /comments
@@ -85,6 +81,7 @@ class CommentsController < ApplicationController
 
   def comment_params
     return {} unless params[:comment]
+
     params.require(:comment).permit(
       :user_id,
       :commentable_type,

data/{config/initializers/authlogic.rb → app/controllers/confirmations_controller.rb}

@@ -4,5 +4,7 @@
 #
 # 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
-#------------------------------------------------------------------------------
-require 'authlogic'
+class ConfirmationsController < Devise::ConfirmationsController
+  respond_to :html
+  append_view_path 'app/views/devise'
+end

data/app/controllers/emails_controller.rb

@@ -6,8 +6,6 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class EmailsController < ApplicationController
-  before_action :require_user
-
   # DELETE /emails/1
   # DELETE /emails/1.json
   # DELETE /emails/1.xml                                                   AJAX

data/app/controllers/entities/accounts_controller.rb

@@ -45,9 +45,7 @@ class AccountsController < EntitiesController
   # GET /accounts/1/edit                                                   AJAX
   #----------------------------------------------------------------------------
   def edit
-    if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Account.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
-    end
+    @previous = Account.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
 
     respond_with(@account)
   end

data/app/controllers/entities/campaigns_controller.rb

@@ -84,9 +84,7 @@ class CampaignsController < EntitiesController
   # GET /campaigns/1/edit                                                  AJAX
   #----------------------------------------------------------------------------
   def edit
-    if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Campaign.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
-    end
+    @previous = Campaign.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
 
     respond_with(@campaign)
   end

data/app/controllers/entities/contacts_controller.rb

@@ -51,9 +51,7 @@ class ContactsController < EntitiesController
   #----------------------------------------------------------------------------
   def edit
     @account = @contact.account || Account.new(user: current_user)
-    if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Contact.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
-    end
+    @previous = Contact.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
 
     respond_with(@contact)
   end
@@ -67,17 +65,7 @@ class ContactsController < EntitiesController
         @contact.add_comment_by_user(@comment_body, current_user)
         @contacts = get_contacts if called_from_index_page?
       else
-        if params[:account]
-          @account = if params[:account][:id].blank?
-                       if request.referer =~ /\/accounts\/(\d+)\z/
-                         Account.find(Regexp.last_match[1]) # related account
-                       else
-                         Account.new(user: current_user)
-                                  end
-                     else
-                       Account.find(params[:account][:id])
-                     end
-        end
+        @account = guess_related_account(params[:account][:id], request.referer, current_user) if params[:account]
         @opportunity = Opportunity.my(current_user).find(params[:opportunity]) unless params[:opportunity].blank?
       end
     end
@@ -87,13 +75,7 @@ class ContactsController < EntitiesController
   #----------------------------------------------------------------------------
   def update
     respond_with(@contact) do |_format|
-      unless @contact.update_with_account_and_permissions(params.permit!)
-        @account = if @contact.account
-                     @contact.account
-                   else
-                     Account.new(user: current_user)
-                   end
-      end
+      @account = @contact.account || Account.new(user: current_user) unless @contact.update_with_account_and_permissions(params.permit!)
     end
   end
 
@@ -128,9 +110,7 @@ class ContactsController < EntitiesController
     # Sorting and naming only: set the same option for Leads if the hasn't been set yet.
     if params[:sort_by]
       current_user.pref[:contacts_sort_by] = Contact.sort_by_map[params[:sort_by]]
-      if Lead.sort_by_fields.include?(params[:sort_by])
-        current_user.pref[:leads_sort_by] ||= Lead.sort_by_map[params[:sort_by]]
-      end
+      current_user.pref[:leads_sort_by] ||= Lead.sort_by_map[params[:sort_by]] if Lead.sort_by_fields.include?(params[:sort_by])
     end
     if params[:naming]
       current_user.pref[:contacts_naming] = params[:naming]

data/app/controllers/entities/leads_controller.rb

@@ -52,9 +52,7 @@ class LeadsController < EntitiesController
   def edit
     get_campaigns
 
-    if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Lead.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
-    end
+    @previous = Lead.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
 
     respond_with(@lead)
   end
@@ -110,9 +108,7 @@ class LeadsController < EntitiesController
     @accounts = Account.my(current_user).order('name')
     @opportunity = Opportunity.new(user: current_user, access: "Lead", stage: "prospecting", campaign: @lead.campaign, source: @lead.source)
 
-    if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Lead.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
-    end
+    @previous = Lead.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
 
     respond_with(@lead)
   end
@@ -142,7 +138,10 @@ class LeadsController < EntitiesController
     update_sidebar
 
     respond_with(@lead) do |format|
-      format.html { flash[:notice] = t(:msg_asset_rejected, @lead.full_name); redirect_to leads_path }
+      format.html do
+        flash[:notice] = t(:msg_asset_rejected, @lead.full_name)
+        redirect_to leads_path
+      end
     end
   end
 
@@ -166,9 +165,7 @@ class LeadsController < EntitiesController
     # Sorting and naming only: set the same option for Contacts if the hasn't been set yet.
     if params[:sort_by]
       current_user.pref[:leads_sort_by] = Lead.sort_by_map[params[:sort_by]]
-      if Contact.sort_by_fields.include?(params[:sort_by])
-        current_user.pref[:contacts_sort_by] ||= Contact.sort_by_map[params[:sort_by]]
-      end
+      current_user.pref[:contacts_sort_by] ||= Contact.sort_by_map[params[:sort_by]] if Contact.sort_by_fields.include?(params[:sort_by])
     end
     if params[:naming]
       current_user.pref[:leads_naming] = params[:naming]

data/app/controllers/entities/opportunities_controller.rb

@@ -34,8 +34,8 @@ class OpportunitiesController < EntitiesController
   #----------------------------------------------------------------------------
   def new
     @opportunity.attributes = { user: current_user, stage: Opportunity.default_stage, access: Setting.default_access, assigned_to: nil }
-    @account     = Account.new(user: current_user, access: Setting.default_access)
-    @accounts    = Account.my(current_user).order('name')
+    @account = Account.new(user: current_user, access: Setting.default_access)
+    @accounts = Account.my(current_user).order('name')
 
     if params[:related]
       model, id = params[:related].split('_')
@@ -57,9 +57,7 @@ class OpportunitiesController < EntitiesController
     @account  = @opportunity.account || Account.new(user: current_user)
     @accounts = Account.my(current_user).order('name')
 
-    if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Opportunity.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
-    end
+    @previous = Opportunity.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
 
     respond_with(@opportunity)
   end
@@ -81,15 +79,7 @@ class OpportunitiesController < EntitiesController
         end
       else
         @accounts = Account.my(current_user).order('name')
-        @account = if params[:account][:id].blank?
-                     if request.referer =~ /\/accounts\/(\d+)\z/
-                       Account.find(Regexp.last_match[1]) # related account
-                     else
-                       Account.new(user: current_user)
-                     end
-                   else
-                     Account.find(params[:account][:id])
-                   end
+        @account = guess_related_account(params[:account][:id], request.referer, current_user)
         @contact = Contact.find(params[:contact]) unless params[:contact].blank?
         @campaign = Campaign.find(params[:campaign]) unless params[:campaign].blank?
       end

data/app/controllers/entities_controller.rb

@@ -6,7 +6,6 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class EntitiesController < ApplicationController
-  before_action :require_user
   before_action :set_current_tab, only: %i[index show]
   before_action :set_view, only: %i[index show redraw]
 
@@ -185,7 +184,7 @@ class EntitiesController < ApplicationController
 
   #----------------------------------------------------------------------------
   def update_recently_viewed
-    entity.versions.create(event: :view, whodunnit: PaperTrail.whodunnit)
+    entity.versions.create(event: :view, whodunnit: PaperTrail.request.whodunnit)
   end
 
   # Somewhat simplistic parser that extracts query and hash-prefixed tags from
@@ -195,13 +194,18 @@ class EntitiesController < ApplicationController
   #----------------------------------------------------------------------------
   def parse_query_and_tags(search_string)
     return ['', ''] if search_string.blank?
+
     query = []
     tags = []
-    search_string.strip.split(/\s+/).each do |token|
-      if token.starts_with?("#")
-        tags << token[1..-1]
-      else
-        query << token
+    if search_string.start_with?("#") && search_string.end_with?("#")
+      tags << search_string[1..-2]
+    else
+      search_string.strip.split(/\s+/).each do |token|
+        if token.starts_with?("#")
+          tags << token[1..-1]
+        else
+          query << token
+        end
       end
     end
     [query.join(" "), tags.join(", ")]
@@ -231,4 +235,14 @@ class EntitiesController < ApplicationController
     page = params[:page]&.to_i
     [0, page].max if page
   end
+
+  def guess_related_account(id, url, user)
+    return Account.find(id) unless id.blank?
+
+    if url =~ %r{/accounts/(\d+)\z}
+      Account.find(Regexp.last_match[1]) # related account
+    else
+      Account.new(user: user)
+    end
+  end
 end