fat_free_crm 0.16.4 → 0.17.1

data/app/assets/javascripts/application.js.erb

@@ -16,8 +16,6 @@
 //= require crm_sortable
 //= require textarea_autocomplete
 //= require crm_textarea_autocomplete
-//= require ajax-chosen-jquery
-//= require crm_chosen
 //= require crm_select2
 //= require ransack_ui_jquery
 //= require search

data/app/assets/javascripts/crm.js.coffee

@@ -90,13 +90,13 @@
 
     # Hide accounts dropdown and show create new account edit field instead.
     #----------------------------------------------------------------------------
-    create_account: ->
-      crm.makeAjaxChosen()
+    show_create_account: ->
       $("#account_disabled_title").hide()
-      $("#account_select_title").hide()
       $("#account_create_title").show()
-      $("#account_id_chzn").hide()
+      $("#account_select_title").hide()
       $("#account_id").prop('disabled', true)
+      $("#account_id").next(".select2-container").disable()
+      $("#account_id").next(".select2-container").hide()
       $("#account_name").prop('disabled', false)
       $("#account_name").html ""
       $("#account_name").show()
@@ -104,45 +104,41 @@
 
     # Hide create account edit field and show accounts dropdown instead.
     #----------------------------------------------------------------------------
-    select_account: ->
-      crm.makeAjaxChosen()
+    show_select_account: ->
       $("#account_disabled_title").hide()
       $("#account_create_title").hide()
       $("#account_select_title").show()
       $("#account_name").hide()
       $("#account_name").prop('disabled', true)
       $("#account_id").prop('disabled', false)
-      $("#account_id_chzn").show()
+      $("#account_id").next(".select2-container").enable()
+      $("#account_id").next(".select2-container").show()
 
 
     # Show accounts dropdown and disable it to prevent changing the account.
     #----------------------------------------------------------------------------
-    select_existing_account: ->
-      crm.makeAjaxChosen()
+    show_disabled_select_account: ->
+      $("#account_disabled_title").show()
       $("#account_create_title").hide()
       $("#account_select_title").hide()
-      $("#account_id").hide()
-      $("#account_disabled_title").show()
       $("#account_name").hide()
       $("#account_name").prop('disabled', true)
 
-      # Disable chosen account select
-      $("#account_id").prop('disabled', true)
-      $("#account_id").trigger "liszt:updated"
-      $("#account_id_chzn").show()
-
-      # Enable hidden account id select so that value is POSTed
+      # Disable select2 account select but enable hidden
+      # account_id select so that value is POSTed
+      $("#account_id").next(".select2-container").disable()
+      $("#account_id").next(".select2-container").show()
       $("#account_id").prop('disabled', false)
 
 
     #----------------------------------------------------------------------------
     create_or_select_account: (selector) ->
       if selector isnt true and selector > 0
-        @select_existing_account() # disabled accounts dropdown
+        @show_disabled_select_account() # disabled accounts dropdown
       else if selector
-        @create_account() # create account edit field
+        @show_create_account() # create account edit field
       else
-        @select_account() # accounts dropdown
+        @show_select_account() # accounts dropdown
 
 
     #----------------------------------------------------------------------------

data/app/assets/stylesheets/application.css.erb

@@ -16,8 +16,6 @@
  *= require base
  *= require header
  *= require common
- *= require chosen
- *= require ffcrm_chosen
  *= require fields
  *= require textarea_autocomplete
  *= require admin/fields

data/app/controllers/admin/application_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.
@@ -22,7 +24,7 @@ class Admin::ApplicationController < ApplicationController
   #----------------------------------------------------------------------------
   def require_admin_user
     require_user
-    if current_user && !current_user.admin?
+    unless current_user&.admin?
       flash[:notice] = t(:msg_require_admin)
       redirect_to root_path
     end

data/app/controllers/admin/field_groups_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.

data/app/controllers/admin/fields_controller.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # 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 Admin::FieldsController < Admin::ApplicationController
-  before_action :setup_current_tab, only: [:index]
+  before_action "set_current_tab('admin/fields')", only: [:index]
+
   load_resource except: %i[create subform]
 
   # GET /fields
@@ -114,8 +117,4 @@ class Admin::FieldsController < Admin::ApplicationController
   def field_params
     params[:field].permit!
   end
-
-  def setup_current_tab
-    set_current_tab('admin/fields')
-  end
 end

data/app/controllers/admin/groups_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.

data/app/controllers/admin/plugins_controller.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # 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 Admin::PluginsController < Admin::ApplicationController
-  before_action :setup_current_tab, only: [:index]
+  before_action "set_current_tab('admin/plugins')", only: [:index]
 
   # GET /admin/plugins
   # GET /admin/plugins.xml
@@ -14,10 +16,4 @@ class Admin::PluginsController < Admin::ApplicationController
 
     respond_with(@plugins)
   end
-
-  protected
-
-  def setup_current_tab
-    set_current_tab('admin/plugins')
-  end
 end

data/app/controllers/admin/settings_controller.rb

@@ -1,18 +1,16 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # 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 Admin::SettingsController < Admin::ApplicationController
-  before_action :setup_current_tab, only: [:index]
+  before_action "set_current_tab('admin/settings')", only: [:index]
 
   # GET /admin/settings
   # GET /admin/settings.xml
   #----------------------------------------------------------------------------
   def index
   end
-
-  def setup_current_tab
-    set_current_tab('admin/settings')
-  end
 end

data/app/controllers/admin/tags_controller.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # 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 Admin::TagsController < Admin::ApplicationController
-  before_action :setup_current_tab, only: %i[index show]
+  before_action "set_current_tab('admin/tags')", only: %i[index show]
 
   load_resource
 
@@ -68,8 +70,4 @@ class Admin::TagsController < Admin::ApplicationController
   def tag_params
     params[:tag].permit!
   end
-
-  def setup_current_tab
-    set_current_tab('admin/tags')
-  end
 end

data/app/controllers/admin/users_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.
@@ -45,7 +47,7 @@ class Admin::UsersController < Admin::ApplicationController
   #----------------------------------------------------------------------------
   def create
     @user = User.new(user_params)
-    @user.check_if_needs_approval
+    @user.suspend_if_needs_approval
     @user.save_without_session_maintenance
 
     respond_with(@user)
@@ -72,7 +74,7 @@ class Admin::UsersController < Admin::ApplicationController
   # DELETE /admin/users/1.xml                                              AJAX
   #----------------------------------------------------------------------------
   def destroy
-    unless @user.destroyable? && @user.destroy
+    unless @user.destroyable?(current_user) && @user.destroy
       flash[:warning] = t(:msg_cant_delete_user, @user.full_name)
     end
 

data/app/controllers/application_controller.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # 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 ApplicationController < ActionController::Base
-  protect_from_forgery
+  protect_from_forgery with: :exception
 
   before_action :set_paper_trail_whodunnit
 
@@ -12,7 +14,7 @@ class ApplicationController < ActionController::Base
   before_action :clear_setting_cache
   before_action :cors_preflight_check
   before_action { hook(:app_before_filter, self) }
-  after_action { hook(:app_after_filter,  self) }
+  after_action { hook(:app_after_filter, self) }
   after_action :cors_set_access_control_headers
 
   helper_method :current_user_session, :current_user, :can_signup?
@@ -36,14 +38,14 @@ class ApplicationController < ActionController::Base
     @auto_complete = hook(:auto_complete, self, query: @query, user: current_user)
     if @auto_complete.empty?
       exclude_ids = auto_complete_ids_to_exclude(params[:related])
-      @auto_complete = klass.my.text_search(@query).ransack(id_not_in: exclude_ids).result.limit(10)
+      @auto_complete = klass.my(current_user).text_search(@query).ransack(id_not_in: exclude_ids).result.limit(10)
     else
       @auto_complete = @auto_complete.last
     end
 
     session[:auto_complete] = controller_name.to_sym
     respond_to do |format|
-      format.any(:js, :html)   { render partial: 'auto_complete' }
+      format.any(:js, :html) { render partial: 'auto_complete' }
       format.json do
         render json: @auto_complete.each_with_object({}) { |a, h|
                        h[a.id] = a.respond_to?(:full_name) ? h(a.full_name) : h(a.name); h
@@ -109,16 +111,14 @@ class ApplicationController < ActionController::Base
   #----------------------------------------------------------------------------
   def current_user_session
     @current_user_session ||= Authentication.find
-    if @current_user_session && @current_user_session.record.suspended?
-      @current_user_session = nil
-    end
+    @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 && current_user_session.record)
+      @current_user = (current_user_session&.record)
       if @current_user
         @current_user.set_individual_locale
         @current_user.set_single_access_token
@@ -167,11 +167,11 @@ class ApplicationController < ActionController::Base
 
   #----------------------------------------------------------------------------
   def called_from_index_page?(controller = controller_name)
-    if controller != "tasks"
-      request.referer =~ %r{/#{controller}$}
-    else
-      request.referer =~ /tasks\?*/
-    end
+    request.referer =~ if controller != "tasks"
+                         %r{/#{controller}$}
+                       else
+                         /tasks\?*/
+                       end
   end
 
   #----------------------------------------------------------------------------
@@ -218,7 +218,7 @@ class ApplicationController < ActionController::Base
     respond_to do |format|
       format.html { redirect_to(redirection_url) }
       format.js   { render plain: 'window.location.reload();' }
-      format.json { render plain: flash[:warning],  status: :not_found }
+      format.json { render plain: flash[:warning], status: :not_found }
       format.xml  { render xml: [flash[:warning]], status: :not_found }
     end
   end
@@ -232,7 +232,7 @@ class ApplicationController < ActionController::Base
     respond_to do |format|
       format.html { redirect_to(url) }
       format.js   { render plain: %(window.location.href = "#{url}";) }
-      format.json { render plain: flash[:warning],  status: :not_found }
+      format.json { render plain: flash[:warning], status: :not_found }
       format.xml  { render xml: [flash[:warning]], status: :not_found }
     end
   end
@@ -243,7 +243,7 @@ class ApplicationController < ActionController::Base
     respond_to do |format|
       format.html { redirect_to(redirection_url) }
       format.js   { render plain: 'window.location.reload();' }
-      format.json { render plain: flash[:warning],  status: :unauthorized }
+      format.json { render plain: flash[:warning], status: :unauthorized }
       format.xml  { render xml: [flash[:warning]], status: :unauthorized }
     end
   end

data/app/controllers/authentications_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.
@@ -24,11 +26,11 @@ class AuthenticationsController < ApplicationController
     if @authentication.save && !@authentication.user.suspended?
       flash[:notice] = t(:msg_welcome)
       if @authentication.user.login_count > 1 && @authentication.user.last_login_at?
-        flash[:notice] << " " << t(:msg_last_login, l(@authentication.user.last_login_at, format: :mmddhhss))
+        flash[:notice] += " " + t(:msg_last_login, l(@authentication.user.last_login_at, format: :mmddhhss))
       end
       redirect_back_or_default root_url
     else
-      if @authentication.user && @authentication.user.awaits_approval?
+      if @authentication.user&.awaits_approval?
         flash[:notice] = t(:msg_account_not_approved)
       else
         flash[:warning] = t(:msg_invalig_login)

data/app/controllers/comments_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.
@@ -13,13 +15,12 @@ class CommentsController < ApplicationController
   def index
     @commentable = extract_commentable_name(params)
     if @commentable
-      @asset = @commentable.classify.constantize.my.find(params[:"#{@commentable}_id"])
+      @asset = @commentable.classify.constantize.my(current_user).find(params[:"#{@commentable}_id"])
       @comments = @asset.comments.order("created_at DESC")
     end
     respond_with(@comments) do |format|
       format.html { redirect_to @asset }
     end
-
   rescue ActiveRecord::RecordNotFound # Kicks in if @asset was not found.
     flash[:warning] = t(:msg_assets_not_available, "notes")
     respond_to do |format|
@@ -36,7 +37,7 @@ class CommentsController < ApplicationController
 
     model = @comment.commentable_type
     id = @comment.commentable_id
-    unless model.constantize.my.find_by_id(id)
+    unless model.constantize.my(current_user).find_by_id(id)
       respond_to_related_not_found(model.downcase)
     end
   end
@@ -52,7 +53,7 @@ class CommentsController < ApplicationController
     # Make sure commentable object exists and is accessible to the current user.
     model = @comment.commentable_type
     id = @comment.commentable_id
-    if model.constantize.my.find_by_id(id)
+    if model.constantize.my(current_user).find_by_id(id)
       @comment.save
       respond_with(@comment)
     else

data/app/controllers/emails_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.

data/app/controllers/entities/accounts_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 AccountsController < EntitiesController
   # GET /accounts
   #----------------------------------------------------------------------------
   def index
-    @accounts = get_accounts(page: params[:page], per_page: params[:per_page])
+    @accounts = get_accounts(page: page_param, per_page: per_page_param)
 
     respond_with @accounts do |format|
       format.xls { render layout: 'header' }
@@ -44,7 +46,7 @@ class AccountsController < EntitiesController
   #----------------------------------------------------------------------------
   def edit
     if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Account.my.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
+      @previous = Account.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
     end
 
     respond_with(@account)
@@ -101,9 +103,9 @@ class AccountsController < EntitiesController
   # GET /accounts/redraw                                                   AJAX
   #----------------------------------------------------------------------------
   def redraw
-    current_user.pref[:accounts_per_page] = params[:per_page] if params[:per_page]
+    current_user.pref[:accounts_per_page] = per_page_param if per_page_param
     current_user.pref[:accounts_sort_by]  = Account.sort_by_map[params[:sort_by]] if params[:sort_by]
-    @accounts = get_accounts(page: 1, per_page: params[:per_page])
+    @accounts = get_accounts(page: 1, per_page: per_page_param)
     set_options # Refresh options
 
     respond_with(@accounts) do |format|
@@ -115,7 +117,7 @@ class AccountsController < EntitiesController
   #----------------------------------------------------------------------------
   def filter
     session[:accounts_filter] = params[:category]
-    @accounts = get_accounts(page: 1, per_page: params[:per_page])
+    @accounts = get_accounts(page: 1, per_page: per_page_param)
 
     respond_with(@accounts) do |format|
       format.js { render :index }
@@ -127,6 +129,11 @@ class AccountsController < EntitiesController
   #----------------------------------------------------------------------------
   alias get_accounts get_list_of_records
 
+  #----------------------------------------------------------------------------
+  def list_includes
+    %i[pipeline_opportunities user tags].freeze
+  end
+
   #----------------------------------------------------------------------------
   def respond_to_destroy(method)
     if method == :ajax
@@ -148,11 +155,11 @@ class AccountsController < EntitiesController
   def get_data_for_sidebar
     @account_category_total = HashWithIndifferentAccess[
                               Setting.account_category.map do |key|
-                                [key, Account.my.where(category: key.to_s).count]
+                                [key, Account.my(current_user).where(category: key.to_s).count]
                               end
     ]
     categorized = @account_category_total.values.sum
-    @account_category_total[:all] = Account.my.count
+    @account_category_total[:all] = Account.my(current_user).count
     @account_category_total[:other] = @account_category_total[:all] - categorized
   end
 end