fat_free_crm 0.17.3 → 0.19.2

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
@@ -196,8 +194,13 @@ class CampaignsController < EntitiesController
                              other: 0
     ]
     Setting.campaign_status.each do |key|
-      @campaign_status_total[key] = Campaign.my(current_user).where(status: key.to_s).count
-      @campaign_status_total[:other] -= @campaign_status_total[key]
+      @campaign_status_total[key] = 0
+    end
+
+    status_counts = Campaign.my(current_user).where(status: Setting.campaign_status).group(:status).count
+    status_counts.each do |key, total|
+      @campaign_status_total[key.to_sym] = total
+      @campaign_status_total[:other] -= total
     end
     @campaign_status_total[:other] += @campaign_status_total[:all]
   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]
@@ -248,10 +245,17 @@ class LeadsController < EntitiesController
                            all: Lead.my(current_user).count,
                            other: 0
       ]
+
       Setting.lead_status.each do |key|
-        @lead_status_total[key] = Lead.my(current_user).where(status: key.to_s).count
-        @lead_status_total[:other] -= @lead_status_total[key]
+        @lead_status_total[key] = 0
+      end
+
+      status_counts = Lead.my(current_user).where(status: Setting.lead_status).group(:status).count
+      status_counts.each do |key, total|
+        @lead_status_total[key.to_sym] = total
+        @lead_status_total[:other] -= total
       end
+
       @lead_status_total[:other] += @lead_status_total[:all]
     end
   end

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
@@ -169,6 +159,10 @@ class OpportunitiesController < EntitiesController
 
   private
 
+  def order_by_attributes(scope, order)
+    scope.weighted_sort.order(order)
+  end
+
   #----------------------------------------------------------------------------
   alias get_opportunities get_list_of_records
 
@@ -207,9 +201,16 @@ class OpportunitiesController < EntitiesController
                                  all: Opportunity.my(current_user).count,
                                  other: 0
       ]
+      stages = []
       @stage.each do |_value, key|
-        @opportunity_stage_total[key] = Opportunity.my(current_user).where(stage: key.to_s).count
-        @opportunity_stage_total[:other] -= @opportunity_stage_total[key]
+        stages << key
+        @opportunity_stage_total[key] = 0
+      end
+
+      stage_counts = Opportunity.my(current_user).where(stage: stages).group(:stage).count
+      stage_counts.each do |key, total|
+        @opportunity_stage_total[key.to_sym] = total
+        @opportunity_stage_total[:other] -= total
       end
       @opportunity_stage_total[:other] += @opportunity_stage_total[:all]
     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]
 
@@ -22,7 +21,7 @@ class EntitiesController < ApplicationController
   # Common attach handler for all core controllers.
   #----------------------------------------------------------------------------
   def attach
-    @attachment = params[:assets].classify.constantize.find(params[:asset_id])
+    @attachment = find_class(params[:assets]).find(params[:asset_id])
     @attached = entity.attach!(@attachment)
     entity.reload
 
@@ -32,7 +31,7 @@ class EntitiesController < ApplicationController
   # Common discard handler for all core controllers.
   #----------------------------------------------------------------------------
   def discard
-    @attachment = params[:attachment].constantize.find(params[:attachment_id])
+    @attachment = find_class(params[:attachment]).find(params[:attachment_id])
     entity.discard!(@attachment)
     entity.reload
 
@@ -152,16 +151,16 @@ class EntitiesController < ApplicationController
       scope = scope.state(filter) if filter.present?
     end
 
-    scope = scope.text_search(query)              if query.present?
+    scope = scope.text_search(query) if query.present?
     scope = scope.tagged_with(tags, on: :tags) if tags.present?
 
     # Ignore this order when doing advanced search
     unless advanced_search
       order = current_user.pref[:"#{controller_name}_sort_by"] || klass.sort_by
-      scope = scope.order(order)
+      scope = order_by_attributes(scope, order)
     end
 
-    @search_results_count = scope.count
+    @search_results_count = scope.size
 
     # Pagination is disabled for xls and csv requests
     unless wants.xls? || wants.csv?
@@ -178,9 +177,14 @@ class EntitiesController < ApplicationController
     scope
   end
 
+  #----------------------------------------------------------------------------
+  def order_by_attributes(scope, order)
+    scope.order(order)
+  end
+
   #----------------------------------------------------------------------------
   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
@@ -190,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(", ")]
@@ -226,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

data/app/controllers/home_controller.rb

@@ -6,7 +6,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class HomeController < ApplicationController
-  before_action :require_user, except: %i[timezone]
+  skip_before_action :authenticate_user!, only: %i[timezone]
   before_action :set_current_tab, only: :index
 
   #----------------------------------------------------------------------------
@@ -160,9 +160,7 @@ class HomeController < ApplicationController
     duration = current_user.pref[:activity_duration]
     if duration
       words = duration.split("_") # "two_weeks" => 2.weeks
-      if %w[one two].include?(words.first) && %w[hour day days week weeks month].include?(words.last)
-        %w[zero one two].index(words.first).send(words.last)
-      end
+      %w[zero one two].index(words.first).send(words.last) if %w[one two].include?(words.first) && %w[hour day days week weeks month].include?(words.last)
     end
   end
 end

data/app/controllers/lists_controller.rb

@@ -33,6 +33,10 @@ class ListsController < ApplicationController
   protected
 
   def list_params
-    params[:list].permit!
+    params.require(:list).permit(
+      :name,
+      :url,
+      :user_id
+    )
   end
 end

data/app/controllers/passwords_controller.rb

@@ -5,63 +5,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
 #------------------------------------------------------------------------------
-class PasswordsController < ApplicationController
-  before_action :load_user_using_perishable_token, only: %i[edit update]
-  before_action :require_no_user
-
-  #----------------------------------------------------------------------------
-  def new
-    # <-- render new.html.haml
-  end
-
-  #----------------------------------------------------------------------------
-  def create
-    @user = User.find_by_email(params[:email])
-    if @user
-      @user.deliver_password_reset_instructions!
-      flash[:notice] = t(:msg_pwd_instructions_sent)
-      redirect_to root_url
-    else
-      flash[:notice] = t(:msg_email_not_found)
-      redirect_to action: :new
-    end
-  end
-
-  #----------------------------------------------------------------------------
-  def edit
-    # <-- render edit.html.haml
-  end
-
-  #----------------------------------------------------------------------------
-  def update
-    if empty_password?
-      flash[:notice] = t(:msg_enter_new_password)
-      render :edit
-    elsif @user.update_attributes(params.require(:user).permit(:password, :password_confirmation))
-      flash[:notice] = t(:msg_password_updated)
-      redirect_to profile_url
-    else
-      render :edit
-    end
-  end
-
-  private
-
-  #----------------------------------------------------------------------------
-  def load_user_using_perishable_token
-    @user = User.find_using_perishable_token(params[:id])
-    unless @user
-      flash[:notice] = <<-EOS
-        Sorry, we could not locate your user profile. Try to copy and paste the URL
-        from your email into your browser or restart the reset password process.
-      EOS
-      redirect_to root_url
-    end
-  end
-
-  #----------------------------------------------------------------------------
-  def empty_password?
-    (params[:user][:password] == params[:user][:password_confirmation]) &&
-      params[:user][:password].blank? # "   ".blank? == true
-  end
+class PasswordsController < Devise::PasswordsController
+  respond_to :html
+  append_view_path 'app/views/devise'
 end

data/{spec/features/support/maintain_sessions.rb → app/controllers/registrations_controller.rb}

@@ -5,8 +5,15 @@
 # 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
 #------------------------------------------------------------------------------
-#
-# Workaround for ActionDispatch::ClosedError
-# https://github.com/binarylogic/authlogic/issues/262#issuecomment-1804988
-#
-User.acts_as_authentic_config[:maintain_sessions] = false
+class RegistrationsController < Devise::RegistrationsController
+  respond_to :html
+  append_view_path 'app/views/devise'
+
+  def edit
+    redirect_to profile_path
+  end
+
+  def after_inactive_sign_up_path_for(*)
+    new_user_session_path
+  end
+end