Merge branch '0.17.x' of github.com:fatfreecrm/fat_free_crm into 0.17.x

Author: Daniel O'Connor

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-01-07 23:59:28 +0900 using RuboCop version 0.52.1.
+# on 2018-01-21 02:52:41 +1030 using RuboCop version 0.52.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -93,7 +93,7 @@ Lint/UselessAssignment:
     - 'app/helpers/application_helper.rb'
     - 'app/views/home/index.atom.builder'
 
-# Offense count: 133
+# Offense count: 132
 Metrics/AbcSize:
   Max: 57
 
@@ -102,10 +102,10 @@ Metrics/AbcSize:
 Metrics/BlockNesting:
   Max: 4
 
-# Offense count: 15
+# Offense count: 14
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 194
+  Max: 199
 
 # Offense count: 29
 Metrics/CyclomaticComplexity:
@@ -330,12 +330,11 @@ Style/RegexpLiteral:
     - 'spec/views/contacts/update.js.haml_spec.rb'
     - 'spec/views/opportunities/update.js.haml_spec.rb'
 
-# Offense count: 9
+# Offense count: 8
 # Cop supports --auto-correct.
 # Configuration parameters: AllowAsExpressionSeparator.
 Style/Semicolon:
   Exclude:
-    - 'app/controllers/application_controller.rb'
     - 'app/controllers/entities/leads_controller.rb'
     - 'lib/fat_free_crm/permissions.rb'
     - 'lib/tasks/ffcrm/setup.rake'
@@ -351,7 +350,7 @@ Style/TrivialAccessors:
   Exclude:
     - 'spec/support/auth_macros.rb'
 
-# Offense count: 2140
+# Offense count: 1922
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:

app/assets/javascripts/crm_select2.js.coffee

@@ -10,9 +10,20 @@
   window.crm ||= {}
 
   crm.make_select2 = ->
-    $(".select2").not(".select2-container, .select2-offscreen").each ->
-    #$(".select2").each ->
-      $(this).select2 'width':'resolve'
+    $(".select2").not(".select2-container, .select2-offscreen, .select2-hidden-accessible").each ->
+
+      #$(".select2").each ->
+        if $(this).data("url")
+          $(this).select2 
+            'width':'resolve'
+            placeholder: $(this).attr("placeholder")
+            ajax:
+              url: $(this).data("url")
+              dataType: 'json'
+        else
+          $(this).select2 
+            'width':'resolve'
+            placeholder: $(this).attr("placeholder")
 
     $(".select2_tag").not(".select2-container, .select2-offscreen").each ->
     #$(".select2_tag").each ->

app/controllers/admin/application_controller.rb

@@ -14,7 +14,7 @@ class Admin::ApplicationController < ApplicationController
   # Autocomplete handler for all admin controllers.
   #----------------------------------------------------------------------------
   def auto_complete
-    @query = params[:auto_complete_query]
+    @query = params[:term]
     @auto_complete = klass.text_search(@query).limit(10)
     render partial: 'auto_complete'
   end

app/controllers/application_controller.rb

@@ -34,7 +34,7 @@ class ApplicationController < ActionController::Base
   # Common auto_complete handler for all core controllers.
   #----------------------------------------------------------------------------
   def auto_complete
-    @query = params[:auto_complete_query] || ''
+    @query = params[:term] || ''
     @auto_complete = hook(:auto_complete, self, query: @query, user: current_user)
     if @auto_complete.empty?
       exclude_ids = auto_complete_ids_to_exclude(params[:related])
@@ -47,9 +47,15 @@ def auto_complete
     respond_to do |format|
       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
-                     }
+        results = @auto_complete.map do |a|
+          {
+            id: a.id,
+            text: a.respond_to?(:full_name) ? a.full_name : a.name
+          }
+        end
+        render json: {
+          results: results
+        }
       end
     end
   end

app/helpers/accounts_helper.rb

@@ -29,8 +29,10 @@ def account_select(options = {})
     options[:selected] = @account&.id || 0
     accounts = ([@account.new_record? ? nil : @account] + Account.my(current_user).order(:name).limit(25)).compact.uniq
     collection_select :account, :id, accounts, :id, :name,
-                      { prompt: t(:select_an_account), include_blank: false },
-                      style: 'width:330px;', class: 'select2'
+                      { include_blank: true },
+                      style: 'width:330px;', class: 'select2',
+                      placeholder: t(:select_an_account),
+                      "data-url": auto_complete_accounts_path(format: 'json')
   end
 
   # Select an existing account or create a new one.
@@ -42,10 +44,10 @@ def account_select_or_create(form, &_block)
     content_tag(:div, class: 'label') do
       t(:account).html_safe +
         content_tag(:span, id: 'account_create_title') do
-          "(#{t :create_new} #{t :or} <a href='#' onclick='crm.show_select_account(); return false;'>#{t :select_existing}</a>):".html_safe
+          " (#{t :create_new} #{t :or} <a href='#' onclick='crm.show_select_account(); return false;'>#{t :select_existing}</a>):".html_safe
         end +
         content_tag(:span, id: 'account_select_title') do
-          "(<a href='#' onclick='crm.show_create_account(); return false;'>#{t :create_new}</a> #{t :or} #{t :select_existing}):".html_safe
+          " (<a href='#' onclick='crm.show_create_account(); return false;'>#{t :create_new}</a> #{t :or} #{t :select_existing}):".html_safe
         end +
         content_tag(:span, ':', id: 'account_disabled_title')
     end +

config/initializers/ransack.rb

@@ -17,6 +17,6 @@
   config.ajax_options = {
     url: '/:controller/auto_complete.json',
     type: 'POST',
-    key: 'auto_complete_query'
+    key: 'term'
   }
 end

spec/shared/controllers.rb

@@ -12,13 +12,13 @@
   end
 
   it "should do the search and find records that match autocomplete query" do
-    get :auto_complete, params: { auto_complete_query: @query }
+    get :auto_complete, params: { term: @query }
     expect(assigns[:query]).to eq(@query)
     expect(assigns[:auto_complete]).to eq(@auto_complete_matches) # Each controller must define it.
   end
 
   it "should save current autocomplete controller in a session" do
-    get :auto_complete, params: { auto_complete_query: @query }
+    get :auto_complete, params: { term: @query }
 
     # We don't save Admin/Users autocomplete controller in a session since Users are not
     # exposed through the Jumpbox.
@@ -28,7 +28,7 @@
   end
 
   it "should render application/_auto_complete template" do
-    post :auto_complete, params: { auto_complete_query: @query }
+    post :auto_complete, params: { term: @query }
     expect(response).to render_template("application/_auto_complete")
   end
 end