fat_free_crm 0.13.6 → 0.14.0

data/Guardfile

@@ -16,7 +16,6 @@ guard 'rspec', zeus: true, bundler: false, all_on_start: false, all_after_pass:
 
   # Capybara features specs
   # watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
-
 end
 
 guard 'rails', server: 'thin', debugger: true, zeus: true do

data/README.md

@@ -50,18 +50,16 @@ Visit our website at http://www.fatfreecrm.com/
 
 ## Rails 4 support
 
-Currently, the master branch and gem releases of Fat Free CRM run on Rails 3.2 However, we are in the midst of upgrading to Rails 4.2, please see the [rails4](https://github.com/fatfreecrm/fat_free_crm/tree/rails4) branch. If you're a developer, you're welcome to check that code out, search for bugs and file them in the issue tracker using the [rails4](https://github.com/fatfreecrm/fat_free_crm/labels/rails4) label.
+The master branch is now on Rails 4.2. However, there is a [Rails 3.2 branch](https://github.com/fatfreecrm/fat_free_crm/tree/rails3) available if you still need to use it. Please note that subsequent gem releases will focus on Rails 4 (v0.14.0+ as yet unreleased).
 
 ## Important security note
 
-Please note that several severe vulnerabilities have been fixed recently. You should upgrade to versions 0.12.3 or 0.13.2 or higher. See the [**security vulnerabilities**](https://github.com/fatfreecrm/fat_free_crm/wiki/Security) page for more details.
+Please note that several severe vulnerabilities have been fixed recently. You should upgrade to the most recent 0.13.x version or higher. See the [**security vulnerabilities**](https://github.com/fatfreecrm/fat_free_crm/wiki/Security) page for more details.
 
 ## System Requirements
 
-* Ruby 2.1 (or 2.0) recommended (it's much faster!)
-  * Ruby 2.2 is not officially supported, but [reported to work for MySQL users](https://github.com/fatfreecrm/fat_free_crm/issues/362)
-  * Ruby 1.9.3 is also compatible
-  * Ruby 1.9.2 should be compatible but is not longer supported
+* Ruby 2 (2.2 recommended)
+  * Ruby 1.9.3 is no longer compatible (final gem release tag v0.13.6)
   * Ruby v1.8.7 was supported until v0.11.4 (see https://github.com/fatfreecrm/fat_free_crm/tree/ruby1.8)
 * MySQL v4.1.1 or later (v5+ is recommended), SQLite v3.4 or later, or Postgres 8.4.8 or later.
 * ImageMagick (optional, only needed if you would like to use avatars)
@@ -93,7 +91,7 @@ This is the best way to deploy Fat Free CRM if you need to add plugins or make a
 
 ## Upgrading from previous versions of Fat Free CRM
 
-Please read the [Release Notes](http://guides.fatfreecrm.com/Release-Notes.html) document for more detailed information on upgrading from previous versions.
+Please read the [Release Notes](https://github.com/fatfreecrm/fat_free_crm/blob/master/CHANGELOG) document for more detailed information on upgrading from previous versions.
 
 
 ## Resources
@@ -115,7 +113,7 @@ Please read the [Release Notes](http://guides.fatfreecrm.com/Release-Notes.html)
 
 ## For Developers
 
-Fat Free CRM is released under the MIT license and is freely available for you to use for your own purposes. We do encourage contributions to make Fat Free CRM even better. Send us a pull-request and we'll do our best to accomodate your needs.
+Fat Free CRM is released under the MIT license and is freely available for you to use for your own purposes. We do encourage contributions to make Fat Free CRM even better. Send us a pull-request and we'll do our best to accommodate your needs.
 
 Specific features that are not 'Fat Free' in nature, can be added by creating Rails Engines. See the [wiki](http://github.com/fatfreecrm/fat_free_crm/wiki) for information on how to do this.
 
@@ -152,4 +150,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -6,4 +6,4 @@ require File.expand_path('../config/application', __FILE__)
 
 FatFreeCRM::Application.load_tasks
 
-task :default => ['spec']
+task default: ['spec']

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

@@ -5,6 +5,7 @@
 //------------------------------------------------------------------------------
 
 //= require jquery
+//= require jquery-migrate
 //= require jquery_ujs
 //= require jquery-ui
 //= require select2

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

@@ -45,11 +45,10 @@
       arrow = $("#" + id + "_arrow")
       arrow = $("#arrow") unless arrow.length
       arrow.html(@EXPANDED)
-      $("#" + id).slideDown(
-        250
-        ->
-          $("#" + id).find(":input[type=text]:first").focus()
-      )
+      $("#" + id).slideDown(250)
+      setTimeout ->
+        $("#" + id).find("input[autofocus]").focus()
+        0
 
 
     #----------------------------------------------------------------------------
@@ -398,12 +397,12 @@
                 $("#auto_complete_query").val ""
             else
               window.location.href = @base_url + "/" + controller + "/" + ui.item.value
-        
+
         focus: (event, ui) =>
           event.preventDefault()
           $("#auto_complete_query").val(ui.item.label)
       )
-      
+
       $.extend $.ui.autocomplete::,
         _renderItem: (ul, item) ->
           term = new RegExp( "(" + @element.val() + ")", "gi" )

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

@@ -41,9 +41,15 @@
           $('#filters').prop('disabled', false) # Enable filters panel (if present)
 
         when 'advanced_search'
-          $("#advanced_search form input:submit").click()
+          $('#advanced_search form input:submit').submit()
           $('#filters').prop('disabled', true) # Disable filters panel (if present)
 
       return
 
+    # Update URL in browser #434
+    $(document).on 'click', '#advanced_search form input:submit', ->
+      # history.pushState(stateObj, title, url)
+      history.pushState("","",window.location.pathname + '?' + $('form.ransack_search').serialize())
+      return
+
 ) jQuery

data/app/assets/stylesheets/about.css.scss

@@ -0,0 +1,10 @@
+#about > ul {
+  margin-left: 15px;
+}
+
+// Quick hack to override jquery-ui.custom.css
+span.ui-button-icon-primary.ui-icon.ui-icon-closethick {
+  top: 0%;
+  left: 0%;
+}
+

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

@@ -8,6 +8,7 @@
 
 /*
  *= require jquery-ui.custom
+ *= require jquery-ui/dialog
  *= require select2
  *= require modalbox
  *= require rails
@@ -24,6 +25,7 @@
  *= require format_buttons
  *= require font-awesome
  *= require lists
+ *= require about
  *= require_self
 
  */

data/app/assets/stylesheets/common.scss

@@ -140,7 +140,7 @@ $sidebar_width: 210px;
   margin: 5px 0px 0px 0px; }
 
 .req, label.required {
-  background: url("/assets/asterisk.gif") no-repeat scroll center right transparent;
+  background: image-url("asterisk.gif") no-repeat scroll center right transparent;
   color: navy;
   display: inline-block; }
 

data/app/controllers/admin/application_controller.rb

@@ -4,7 +4,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class Admin::ApplicationController < ApplicationController
-  before_filter :require_admin_user
+  before_action :require_admin_user
 
   layout "admin/application"
   helper "admin/field_groups"
@@ -14,10 +14,10 @@ class Admin::ApplicationController < ApplicationController
   def auto_complete
     @query = params[:auto_complete_query]
     @auto_complete = klass.text_search(@query).limit(10)
-    render :partial => 'auto_complete'
+    render partial: 'auto_complete'
   end
 
-private
+  private
 
   #----------------------------------------------------------------------------
   def require_admin_user

data/app/controllers/admin/field_groups_controller.rb

@@ -4,14 +4,13 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class Admin::FieldGroupsController < Admin::ApplicationController
-
   helper 'admin/fields'
 
   # GET /admin/field_groups/new
   # GET /admin/field_groups/new.xml                                        AJAX
   #----------------------------------------------------------------------------
   def new
-    @field_group = FieldGroup.new(:klass_name => params[:klass_name])
+    @field_group = FieldGroup.new(klass_name: params[:klass_name])
 
     respond_with(@field_group)
   end
@@ -22,7 +21,7 @@ class Admin::FieldGroupsController < Admin::ApplicationController
     @field_group = FieldGroup.find(params[:id])
 
     if params[:previous].to_s =~ /(\d+)\z/
-      @previous = FieldGroup.find_by_id($1) || $1.to_i
+      @previous = FieldGroup.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
     end
 
     respond_with(@field_group)
@@ -32,7 +31,7 @@ class Admin::FieldGroupsController < Admin::ApplicationController
   # POST /admin/field_groups.xml                                           AJAX
   #----------------------------------------------------------------------------
   def create
-    @field_group = FieldGroup.create(params[:field_group])
+    @field_group = FieldGroup.create(field_group_params)
 
     respond_with(@field_group)
   end
@@ -42,7 +41,7 @@ class Admin::FieldGroupsController < Admin::ApplicationController
   #----------------------------------------------------------------------------
   def update
     @field_group = FieldGroup.find(params[:id])
-    @field_group.update_attributes(params[:field_group])
+    @field_group.update_attributes(field_group_params)
 
     respond_with(@field_group)
   end
@@ -64,10 +63,10 @@ class Admin::FieldGroupsController < Admin::ApplicationController
     field_group_ids = params["#{asset}_field_groups"]
 
     field_group_ids.each_with_index do |id, index|
-      FieldGroup.update_all({:position => index+1}, {:id => id})
+      FieldGroup.where(id: id).update_all(position: index + 1)
     end
 
-    render :nothing => true
+    render nothing: true
   end
 
   # GET /admin/field_groups/1/confirm                                      AJAX
@@ -75,4 +74,10 @@ class Admin::FieldGroupsController < Admin::ApplicationController
   def confirm
     @field_group = FieldGroup.find(params[:id])
   end
+
+  protected
+
+  def field_group_params
+    params[:field_group].permit!
+  end
 end

data/app/controllers/admin/fields_controller.rb

@@ -4,9 +4,9 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class Admin::FieldsController < Admin::ApplicationController
-  before_filter "set_current_tab('admin/fields')", :only => [ :index ]
+  before_action "set_current_tab('admin/fields')", only: [:index]
 
-  load_resource :except => [:create, :subform]
+  load_resource except: [:create, :subform]
 
   # GET /fields
   # GET /fields.xml                                                      HTML
@@ -40,30 +40,29 @@ class Admin::FieldsController < Admin::ApplicationController
   # POST /fields.xml                                                     AJAX
   #----------------------------------------------------------------------------
   def create
-    as = params[:field][:as]
+    as = field_params[:as]
     @field =
       if as =~ /pair/
         CustomFieldPair.create_pair(params).first
       elsif as.present?
         klass = Field.lookup_class(as).classify.constantize
-        klass.create(params[:field])
+        klass.create(field_params)
       else
-        Field.new(params[:field]).tap(&:valid?)
+        Field.new(field_params).tap(&:valid?)
       end
 
     respond_with(@field)
-
   end
 
   # PUT /fields/1
   # PUT /fields/1.xml                                                    AJAX
   #----------------------------------------------------------------------------
   def update
-    if (params[:field][:as] =~ /pair/)
+    if field_params[:as] =~ /pair/
       @field = CustomFieldPair.update_pair(params).first
     else
       @field = Field.find(params[:id])
-      @field.update_attributes(params[:field])
+      @field.update_attributes(field_params)
     end
 
     respond_with(@field)
@@ -86,29 +85,34 @@ class Admin::FieldsController < Admin::ApplicationController
     field_ids = params["fields_field_group_#{field_group_id}"] || []
 
     field_ids.each_with_index do |id, index|
-      Field.update_all({:position => index+1, :field_group_id => field_group_id}, {:id => id})
+      Field.where(id: id).update_all(position: index + 1, field_group_id: field_group_id)
     end
 
-    render :nothing => true
+    render nothing: true
   end
 
   # GET /fields/subform
   #----------------------------------------------------------------------------
   def subform
-    field = params[:field]
+    field = field_params
     as = field[:as]
 
     @field = if (id = field[:id]).present?
-        Field.find(id).tap{|f| f.as = as}
-      else
-        field_group_id = field[:field_group_id]
-        klass = Field.lookup_class(as).classify.constantize
-        klass.new(:field_group_id => field_group_id, :as => as)
+               Field.find(id).tap { |f| f.as = as }
+             else
+               field_group_id = field[:field_group_id]
+               klass = Field.lookup_class(as).classify.constantize
+               klass.new(field_group_id: field_group_id, as: as)
       end
 
     respond_with(@field) do |format|
-      format.html { render :partial => 'admin/fields/subform' }
+      format.html { render partial: 'admin/fields/subform' }
     end
   end
 
+  protected
+
+  def field_params
+    params[:field].permit!
+  end
 end

data/app/controllers/admin/groups_controller.rb

@@ -4,14 +4,14 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class Admin::GroupsController < Admin::ApplicationController
-  before_filter "set_current_tab('admin/groups')", :only => [ :index, :show ]
+  before_action "set_current_tab('admin/groups')", only: [:index, :show]
 
   load_resource
 
   # GET /groups
   #----------------------------------------------------------------------------
   def index
-    @groups = @groups.unscoped.paginate(:page => params[:page])
+    @groups = @groups.unscoped.paginate(page: params[:page])
   end
 
   # GET /groups/1
@@ -35,7 +35,7 @@ class Admin::GroupsController < Admin::ApplicationController
   # POST /groups
   #----------------------------------------------------------------------------
   def create
-    @group.attributes = params[:group]
+    @group.attributes = group_params
     @group.save
 
     respond_with(@group)
@@ -44,7 +44,7 @@ class Admin::GroupsController < Admin::ApplicationController
   # PUT /groups/1
   #----------------------------------------------------------------------------
   def update
-    @group.update_attributes(params[:group])
+    @group.update_attributes(group_params)
 
     respond_with(@group)
   end
@@ -56,4 +56,10 @@ class Admin::GroupsController < Admin::ApplicationController
 
     respond_with(@group)
   end
+
+  protected
+
+  def group_params
+    params[:group].permit!
+  end
 end

data/app/controllers/admin/plugins_controller.rb

@@ -4,7 +4,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class Admin::PluginsController < Admin::ApplicationController
-  before_filter "set_current_tab('admin/plugins')", :only => [ :index ]
+  before_action "set_current_tab('admin/plugins')", only: [:index]
 
   # GET /admin/plugins
   # GET /admin/plugins.xml
@@ -15,4 +15,3 @@ class Admin::PluginsController < Admin::ApplicationController
     respond_with(@plugins)
   end
 end
-

data/app/controllers/admin/settings_controller.rb

@@ -4,7 +4,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class Admin::SettingsController < Admin::ApplicationController
-  before_filter "set_current_tab('admin/settings')", :only => [ :index ]
+  before_action "set_current_tab('admin/settings')", only: [:index]
 
   # GET /admin/settings
   # GET /admin/settings.xml
@@ -12,4 +12,3 @@ class Admin::SettingsController < Admin::ApplicationController
   def index
   end
 end
-

data/app/controllers/admin/tags_controller.rb

@@ -4,7 +4,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class Admin::TagsController < Admin::ApplicationController
-  before_filter "set_current_tab('admin/tags')", :only => [ :index, :show ]
+  before_action "set_current_tab('admin/tags')", only: [:index, :show]
 
   load_resource
 
@@ -27,7 +27,7 @@ class Admin::TagsController < Admin::ApplicationController
   #----------------------------------------------------------------------------
   def edit
     if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Tag.find_by_id($1) || $1.to_i
+      @previous = Tag.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i
     end
   end
 
@@ -35,7 +35,7 @@ class Admin::TagsController < Admin::ApplicationController
   # POST /admin/tags.xml                                                  AJAX
   #----------------------------------------------------------------------------
   def create
-    @tag.update_attributes(params[:tag])
+    @tag.update_attributes(tag_params)
 
     respond_with(@tag)
   end
@@ -44,7 +44,7 @@ class Admin::TagsController < Admin::ApplicationController
   # PUT /admin/tags/1.xml                                                 AJAX
   #----------------------------------------------------------------------------
   def update
-    @tag.update_attributes(params[:tag])
+    @tag.update_attributes(tag_params)
 
     respond_with(@tag)
   end
@@ -62,4 +62,10 @@ class Admin::TagsController < Admin::ApplicationController
   #----------------------------------------------------------------------------
   def confirm
   end
+
+  protected
+
+  def tag_params
+    params[:tag].permit!
+  end
 end