fat_free_crm 0.16.4 → 0.17.1

data/app/controllers/entities/campaigns_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -9,7 +11,7 @@ class CampaignsController < EntitiesController
   # GET /campaigns
   #----------------------------------------------------------------------------
   def index
-    @campaigns = get_campaigns(page: params[:page], per_page: params[:per_page])
+    @campaigns = get_campaigns(page: page_param, per_page: per_page_param)
 
     respond_with @campaigns do |format|
       format.xls { render layout: 'header' }
@@ -69,7 +71,7 @@ class CampaignsController < EntitiesController
 
     if params[:related]
       model, id = params[:related].split('_')
-      if related = model.classify.constantize.my.find_by_id(id)
+      if related = model.classify.constantize.my(current_user).find_by_id(id)
         instance_variable_set("@#{model}", related)
       else
         respond_to_related_not_found(model) && return
@@ -83,7 +85,7 @@ class CampaignsController < EntitiesController
   #----------------------------------------------------------------------------
   def edit
     if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Campaign.my.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
+      @previous = Campaign.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
     end
 
     respond_with(@campaign)
@@ -139,9 +141,9 @@ class CampaignsController < EntitiesController
   # GET /campaigns/redraw                                                  AJAX
   #----------------------------------------------------------------------------
   def redraw
-    current_user.pref[:campaigns_per_page] = params[:per_page] if params[:per_page]
+    current_user.pref[:campaigns_per_page] = per_page_param if per_page_param
     current_user.pref[:campaigns_sort_by]  = Campaign.sort_by_map[params[:sort_by]] if params[:sort_by]
-    @campaigns = get_campaigns(page: 1, per_page: params[:per_page])
+    @campaigns = get_campaigns(page: 1, per_page: per_page_param)
     set_options # Refresh options
 
     respond_with(@campaigns) do |format|
@@ -153,7 +155,7 @@ class CampaignsController < EntitiesController
   #----------------------------------------------------------------------------
   def filter
     session[:campaigns_filter] = params[:status]
-    @campaigns = get_campaigns(page: 1, per_page: params[:per_page])
+    @campaigns = get_campaigns(page: 1, per_page: per_page_param)
 
     respond_with(@campaigns) do |format|
       format.js { render :index }
@@ -165,6 +167,11 @@ class CampaignsController < EntitiesController
   #----------------------------------------------------------------------------
   alias get_campaigns get_list_of_records
 
+  #----------------------------------------------------------------------------
+  def list_includes
+    %i[tags].freeze
+  end
+
   #----------------------------------------------------------------------------
   def respond_to_destroy(method)
     if method == :ajax
@@ -185,11 +192,11 @@ class CampaignsController < EntitiesController
   #----------------------------------------------------------------------------
   def get_data_for_sidebar
     @campaign_status_total = HashWithIndifferentAccess[
-                             all: Campaign.my.count,
+                             all: Campaign.my(current_user).count,
                              other: 0
     ]
     Setting.campaign_status.each do |key|
-      @campaign_status_total[key] = Campaign.my.where(status: key.to_s).count
+      @campaign_status_total[key] = Campaign.my(current_user).where(status: key.to_s).count
       @campaign_status_total[:other] -= @campaign_status_total[key]
     end
     @campaign_status_total[:other] += @campaign_status_total[:all]

data/app/controllers/entities/contacts_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -9,7 +11,7 @@ class ContactsController < EntitiesController
   # GET /contacts
   #----------------------------------------------------------------------------
   def index
-    @contacts = get_contacts(page: params[:page], per_page: params[:per_page])
+    @contacts = get_contacts(page: page_param, per_page: per_page_param)
 
     respond_with @contacts do |format|
       format.xls { render layout: 'header' }
@@ -35,7 +37,7 @@ class ContactsController < EntitiesController
 
     if params[:related]
       model, id = params[:related].split('_')
-      if related = model.classify.constantize.my.find_by_id(id)
+      if related = model.classify.constantize.my(current_user).find_by_id(id)
         instance_variable_set("@#{model}", related)
       else
         respond_to_related_not_found(model) && return
@@ -50,7 +52,7 @@ class ContactsController < EntitiesController
   def edit
     @account = @contact.account || Account.new(user: current_user)
     if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Contact.my.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
+      @previous = Contact.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
     end
 
     respond_with(@contact)
@@ -66,17 +68,17 @@ class ContactsController < EntitiesController
         @contacts = get_contacts if called_from_index_page?
       else
         if params[:account]
-          if params[:account][:id].blank?
-            if request.referer =~ /\/accounts\/(\d+)\z/
-              @account = Account.find(Regexp.last_match[1]) # related account
-            else
-              @account = Account.new(user: current_user)
-            end
-          else
-            @account = Account.find(params[:account][:id])
-          end
+          @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
-        @opportunity = Opportunity.my.find(params[:opportunity]) unless params[:opportunity].blank?
+        @opportunity = Opportunity.my(current_user).find(params[:opportunity]) unless params[:opportunity].blank?
       end
     end
   end
@@ -86,11 +88,11 @@ class ContactsController < EntitiesController
   def update
     respond_with(@contact) do |_format|
       unless @contact.update_with_account_and_permissions(params.permit!)
-        if @contact.account
-          @account = @contact.account
-        else
-          @account = Account.new(user: current_user)
-        end
+        @account = if @contact.account
+                     @contact.account
+                   else
+                     Account.new(user: current_user)
+                   end
       end
     end
   end
@@ -121,7 +123,7 @@ class ContactsController < EntitiesController
   # GET /contacts/redraw                                                   AJAX
   #----------------------------------------------------------------------------
   def redraw
-    current_user.pref[:contacts_per_page] = params[:per_page] if params[:per_page]
+    current_user.pref[:contacts_per_page] = per_page_param if per_page_param
 
     # Sorting and naming only: set the same option for Leads if the hasn't been set yet.
     if params[:sort_by]
@@ -135,7 +137,7 @@ class ContactsController < EntitiesController
       current_user.pref[:leads_naming] ||= params[:naming]
     end
 
-    @contacts = get_contacts(page: 1, per_page: params[:per_page]) # Start on the first page.
+    @contacts = get_contacts(page: 1, per_page: per_page_param) # Start on the first page.
     set_options # Refresh options
 
     respond_with(@contacts) do |format|
@@ -148,9 +150,14 @@ class ContactsController < EntitiesController
   #----------------------------------------------------------------------------
   alias get_contacts get_list_of_records
 
+  #----------------------------------------------------------------------------
+  def list_includes
+    %i[account tags].freeze
+  end
+
   #----------------------------------------------------------------------------
   def get_accounts
-    @accounts = Account.my.order('name')
+    @accounts = Account.my(current_user).order('name')
   end
 
   def set_options

data/app/controllers/entities/leads_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -10,7 +12,7 @@ class LeadsController < EntitiesController
   # GET /leads
   #----------------------------------------------------------------------------
   def index
-    @leads = get_leads(page: params[:page])
+    @leads = get_leads(page: page_param)
 
     respond_with @leads do |format|
       format.xls { render layout: 'header' }
@@ -35,7 +37,7 @@ class LeadsController < EntitiesController
 
     if params[:related]
       model, id = params[:related].split('_')
-      if related = model.classify.constantize.my.find_by_id(id)
+      if related = model.classify.constantize.my(current_user).find_by_id(id)
         instance_variable_set("@#{model}", related)
       else
         respond_to_related_not_found(model) && return
@@ -51,7 +53,7 @@ class LeadsController < EntitiesController
     get_campaigns
 
     if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Lead.my.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
+      @previous = Lead.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
     end
 
     respond_with(@lead)
@@ -85,7 +87,7 @@ class LeadsController < EntitiesController
       if @lead.update_with_lead_counters(resource_params)
         update_sidebar
       else
-        @campaigns = Campaign.my.order('name')
+        @campaigns = Campaign.my(current_user).order('name')
       end
     end
   end
@@ -105,11 +107,11 @@ class LeadsController < EntitiesController
   #----------------------------------------------------------------------------
   def convert
     @account = Account.new(user: current_user, name: @lead.company, access: "Lead")
-    @accounts = Account.my.order('name')
+    @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.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
+      @previous = Lead.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
     end
 
     respond_with(@lead)
@@ -119,7 +121,7 @@ class LeadsController < EntitiesController
   #----------------------------------------------------------------------------
   def promote
     @account, @opportunity, @contact = @lead.promote(params.permit!)
-    @accounts = Account.my.order('name')
+    @accounts = Account.my(current_user).order('name')
     @stage = Setting.unroll(:opportunity_stage)
 
     respond_with(@lead) do |format|
@@ -159,7 +161,7 @@ class LeadsController < EntitiesController
   # GET /leads/redraw                                                      AJAX
   #----------------------------------------------------------------------------
   def redraw
-    current_user.pref[:leads_per_page] = params[:per_page] if params[:per_page]
+    current_user.pref[:leads_per_page] = per_page_param if per_page_param
 
     # Sorting and naming only: set the same option for Contacts if the hasn't been set yet.
     if params[:sort_by]
@@ -173,7 +175,7 @@ class LeadsController < EntitiesController
       current_user.pref[:contacts_naming] ||= params[:naming]
     end
 
-    @leads = get_leads(page: 1, per_page: params[:per_page]) # Start one the first page.
+    @leads = get_leads(page: 1, per_page: per_page_param) # Start one the first page.
     set_options # Refresh options
 
     respond_with(@leads) do |format|
@@ -185,7 +187,7 @@ class LeadsController < EntitiesController
   #----------------------------------------------------------------------------
   def filter
     session[:leads_filter] = params[:status]
-    @leads = get_leads(page: 1, per_page: params[:per_page]) # Start one the first page.
+    @leads = get_leads(page: 1, per_page: per_page_param) # Start one the first page.
 
     respond_with(@leads) do |format|
       format.js { render :index }
@@ -197,9 +199,14 @@ class LeadsController < EntitiesController
   #----------------------------------------------------------------------------
   alias get_leads get_list_of_records
 
+  #----------------------------------------------------------------------------
+  def list_includes
+    %i[tags].freeze
+  end
+
   #----------------------------------------------------------------------------
   def get_campaigns
-    @campaigns = Campaign.my.order('name')
+    @campaigns = Campaign.my(current_user).order('name')
   end
 
   def set_options
@@ -210,17 +217,21 @@ class LeadsController < EntitiesController
   #----------------------------------------------------------------------------
   def respond_to_destroy(method)
     if method == :ajax
-      if called_from_index_page?                  # Called from Leads index.
-        get_data_for_sidebar                      # Get data for the sidebar.
-        @leads = get_leads                        # Get leads for current page.
-        if @leads.blank?                          # If no lead on this page then try the previous one.
+      if called_from_index_page? # Called from Leads index.
+        get_data_for_sidebar
+        @leads = get_leads
+        if @leads.blank?
+          # If no lead on this page then try the previous one.
+          # and reload the whole list even if it's empty.
           @leads = get_leads(page: current_page - 1) if current_page > 1
-          render(:index) && return                # And reload the whole list even if it's empty.
+          render(:index) && return
         end
-      else                                        # Called from related asset.
-        self.current_page = 1                     # Reset current page to 1 to make sure it stays valid.
-        @campaign = @lead.campaign                # Reload lead's campaign if any.
-      end                                         # Render destroy.js
+      else # Called from related asset.
+        # Reset current page to 1 to make sure it stays valid.
+        # Reload lead's campaign if any and render destroy.js
+        self.current_page = 1
+        @campaign = @lead.campaign
+      end
     else # :html destroy
       self.current_page = 1
       flash[:notice] = t(:msg_asset_deleted, @lead.full_name)
@@ -234,11 +245,11 @@ class LeadsController < EntitiesController
       instance_variable_set("@#{related}", @lead.send(related)) if called_from_landing_page?(related.to_s.pluralize)
     else
       @lead_status_total = HashWithIndifferentAccess[
-                           all: Lead.my.count,
+                           all: Lead.my(current_user).count,
                            other: 0
       ]
       Setting.lead_status.each do |key|
-        @lead_status_total[key] = Lead.my.where(status: key.to_s).count
+        @lead_status_total[key] = Lead.my(current_user).where(status: key.to_s).count
         @lead_status_total[:other] -= @lead_status_total[key]
       end
       @lead_status_total[:other] += @lead_status_total[:all]

data/app/controllers/entities/opportunities_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -11,7 +13,7 @@ class OpportunitiesController < EntitiesController
   # GET /opportunities
   #----------------------------------------------------------------------------
   def index
-    @opportunities = get_opportunities(page: params[:page], per_page: params[:per_page])
+    @opportunities = get_opportunities(page: page_param, per_page: per_page_param)
 
     respond_with @opportunities do |format|
       format.xls { render layout: 'header' }
@@ -33,11 +35,11 @@ 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.order('name')
+    @accounts    = Account.my(current_user).order('name')
 
     if params[:related]
       model, id = params[:related].split('_')
-      if related = model.classify.constantize.my.find_by_id(id)
+      if related = model.classify.constantize.my(current_user).find_by_id(id)
         instance_variable_set("@#{model}", related)
         @account = related.account if related.respond_to?(:account) && !related.account.nil?
         @campaign = related.campaign if related.respond_to?(:campaign)
@@ -53,10 +55,10 @@ class OpportunitiesController < EntitiesController
   #----------------------------------------------------------------------------
   def edit
     @account  = @opportunity.account || Account.new(user: current_user)
-    @accounts = Account.my.order('name')
+    @accounts = Account.my(current_user).order('name')
 
     if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Opportunity.my.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
+      @previous = Opportunity.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
     end
 
     respond_with(@opportunity)
@@ -78,16 +80,16 @@ class OpportunitiesController < EntitiesController
           get_data_for_sidebar(:campaign)
         end
       else
-        @accounts = Account.my.order('name')
-        if params[:account][:id].blank?
-          if request.referer =~ /\/accounts\/(\d+)\z/
-            @account = Account.find(Regexp.last_match[1]) # related account
-          else
-            @account = Account.new(user: current_user)
-          end
-        else
-          @account = Account.find(params[:account][:id])
-        end
+        @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
         @contact = Contact.find(params[:contact]) unless params[:contact].blank?
         @campaign = Campaign.find(params[:campaign]) unless params[:campaign].blank?
       end
@@ -107,12 +109,12 @@ class OpportunitiesController < EntitiesController
           get_data_for_sidebar(:campaign)
         end
       else
-        @accounts = Account.my.order('name')
-        if @opportunity.account
-          @account = Account.find(@opportunity.account.id)
-        else
-          @account = Account.new(user: current_user)
-        end
+        @accounts = Account.my(current_user).order('name')
+        @account = if @opportunity.account
+                     Account.find(@opportunity.account.id)
+                   else
+                     Account.new(user: current_user)
+                   end
       end
     end
   end
@@ -148,7 +150,7 @@ class OpportunitiesController < EntitiesController
   # GET /opportunities/redraw                                              AJAX
   #----------------------------------------------------------------------------
   def redraw
-    @opportunities = get_opportunities(page: 1, per_page: params[:per_page])
+    @opportunities = get_opportunities(page: 1, per_page: per_page_param)
     set_options # Refresh options
 
     respond_with(@opportunities) do |format|
@@ -159,7 +161,7 @@ class OpportunitiesController < EntitiesController
   # POST /opportunities/filter                                             AJAX
   #----------------------------------------------------------------------------
   def filter
-    @opportunities = get_opportunities(page: 1, per_page: params[:per_page])
+    @opportunities = get_opportunities(page: 1, per_page: per_page_param)
     respond_with(@opportunities) do |format|
       format.js { render :index }
     end
@@ -170,6 +172,11 @@ class OpportunitiesController < EntitiesController
   #----------------------------------------------------------------------------
   alias get_opportunities get_list_of_records
 
+  #----------------------------------------------------------------------------
+  def list_includes
+    %i[account user tags].freeze
+  end
+
   #----------------------------------------------------------------------------
   def respond_to_destroy(method)
     if method == :ajax
@@ -197,11 +204,11 @@ class OpportunitiesController < EntitiesController
       instance_variable_set("@#{related}", @opportunity.send(related)) if called_from_landing_page?(related.to_s.pluralize)
     else
       @opportunity_stage_total = HashWithIndifferentAccess[
-                                 all: Opportunity.my.count,
+                                 all: Opportunity.my(current_user).count,
                                  other: 0
       ]
       @stage.each do |_value, key|
-        @opportunity_stage_total[key] = Opportunity.my.where(stage: key.to_s).count
+        @opportunity_stage_total[key] = Opportunity.my(current_user).where(stage: key.to_s).count
         @opportunity_stage_total[:other] -= @opportunity_stage_total[key]
       end
       @opportunity_stage_total[:other] += @opportunity_stage_total[:all]
@@ -215,7 +222,7 @@ class OpportunitiesController < EntitiesController
 
   #----------------------------------------------------------------------------
   def set_params
-    current_user.pref[:opportunities_per_page] = params[:per_page] if params[:per_page]
+    current_user.pref[:opportunities_per_page] = per_page_param if per_page_param
     current_user.pref[:opportunities_sort_by]  = Opportunity.sort_by_map[params[:sort_by]] if params[:sort_by]
     session[:opportunities_filter] = params[:stage] if params[:stage]
   end