fat_free_crm 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6602384ff554b707d3f991e9f409282ec14218ed
-  data.tar.gz: 667955bbb3f0a40b7829585fa240f97d3eb4a764
+  metadata.gz: 7221e26b201b43c86185ba3c5c836a217ce877c2
+  data.tar.gz: 88605bc299c4cc32ed059c3fcc4bc4c37da167fe
 SHA512:
-  metadata.gz: 3c5d7b512bb9c3dbf43a7199420a44a81f1bc0741b9ec2b6312a1c1d05de606bab919bc01afc3f89a41fe463e677cfe94eeeaa7e43e3321b9d570a2cdfde5932
-  data.tar.gz: 9171f42450fc3ea3ee6823f9d7c864aca05c79ae2254040d278eaae663a41d07973046c7646bd4f9d367471950a72b4167028120364a3d5bd54d5df2fbf73e2e
+  metadata.gz: 29471fdc624409ce11715db80702efcaf214fb95fb7fbeba0702b1e4bf6e56b732d7f9e7abe7a2fa384fecb7c8d7b0afbedfc2617ddaac9d6c5572f572061bfb
+  data.tar.gz: 31608af4f51f58ff87f51ff9a8e43420374efeb3cea34e526fee18d7a335f93e381d6a6d38a97a895709f4bae89494100c2d454e181496d3c216e5ed5fd7d12d

data/.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:

data/CHANGELOG.md

@@ -4,11 +4,19 @@ It does not matter how slowly you go as long as you do not stop.
 First they ignore you, then they laugh at you, then they fight you,
 then you win. –- Mahatma Gandhi
 
+Mon Jan 22, 2018 (0.17.2)
+---------------------------------------------------------------------
+ - Fix CVE-2017-0889
+ - Fix #687
+
+Mon Jan 22, 2018 (0.16.2)
+---------------------------------------------------------------------
+ - Fix #687
+
 Sat Jan 20, 2018 (0.17.1)
 ---------------------------------------------------------------------
  - #709 Revert accidental minimum ruby version 2.4 changes (#665)
 
-
 Sat Jan 20, 2018 (0.17.0)
 ---------------------------------------------------------------------
 

data/Gemfile.lock

@@ -162,7 +162,7 @@ GEM
       tilt
     headless (2.3.1)
     htmlentities (4.3.4)
-    i18n (0.9.1)
+    i18n (0.9.3)
       concurrent-ruby (~> 1.0)
     i18n_data (0.8.0)
     io-like (0.3.0)
@@ -208,7 +208,7 @@ GEM
     paper_trail (6.0.2)
       activerecord (>= 4.0, < 5.2)
       request_store (~> 1.1)
-    paperclip (5.1.0)
+    paperclip (5.2.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
@@ -474,4 +474,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

data/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 ->

data/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

data/app/controllers/admin/fields_controller.rb

@@ -6,8 +6,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class Admin::FieldsController < Admin::ApplicationController
-  before_action "set_current_tab('admin/fields')", only: [:index]
-
+  before_action :setup_current_tab, only: [:index]
   load_resource except: %i[create subform]
 
   # GET /fields
@@ -117,4 +116,8 @@ 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/plugins_controller.rb

@@ -6,7 +6,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class Admin::PluginsController < Admin::ApplicationController
-  before_action "set_current_tab('admin/plugins')", only: [:index]
+  before_action :setup_current_tab, only: [:index]
 
   # GET /admin/plugins
   # GET /admin/plugins.xml
@@ -16,4 +16,10 @@ 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

@@ -6,11 +6,15 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class Admin::SettingsController < Admin::ApplicationController
-  before_action "set_current_tab('admin/settings')", only: [:index]
+  before_action :setup_current_tab, 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

@@ -6,7 +6,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class Admin::TagsController < Admin::ApplicationController
-  before_action "set_current_tab('admin/tags')", only: %i[index show]
+  before_action :setup_current_tab, only: %i[index show]
 
   load_resource
 
@@ -70,4 +70,8 @@ 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/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 @@ class ApplicationController < ActionController::Base
     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

data/app/helpers/accounts_helper.rb

@@ -29,8 +29,10 @@ module AccountsHelper
     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 @@ module AccountsHelper
     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 +

data/config/initializers/ransack.rb

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

data/lib/fat_free_crm/version.rb

@@ -9,7 +9,7 @@ module FatFreeCRM
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 17
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/spec/shared/controllers.rb

@@ -12,13 +12,13 @@ shared_examples "auto complete" do
   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 @@ shared_examples "auto complete" do
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_free_crm
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.2
 platform: ruby
 authors:
 - Michael Dvorkin
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-20 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1581,7 +1581,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Fat Free CRM