fat_free_crm 0.13.6 → 0.14.0

data/app/controllers/users_controller.rb

@@ -4,13 +4,12 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class UsersController < ApplicationController
-
-  before_filter :set_current_tab, :only => [ :show, :opportunities_overview ] # Don't hightlight any tabs.
+  before_action :set_current_tab, only: [:show, :opportunities_overview] # Don't hightlight any tabs.
 
   check_authorization
   load_and_authorize_resource # handles all security
 
-  respond_to :html, :only => [ :show, :new ]
+  respond_to :html, only: [:show, :new]
 
   # GET /users/1
   # GET /users/1.js
@@ -54,7 +53,7 @@ class UsersController < ApplicationController
   # PUT /users/1.js
   #----------------------------------------------------------------------------
   def update
-    @user.update_attributes(params[:user])
+    @user.update_attributes(user_params)
     respond_with(@user)
   end
 
@@ -75,7 +74,7 @@ class UsersController < ApplicationController
       render
     else
       if params[:avatar]
-        avatar = Avatar.create(params[:avatar].merge(:entity => @user))
+        avatar = Avatar.create(avatar_params)
         if avatar.valid?
           @user.avatar = avatar
         else
@@ -86,7 +85,7 @@ class UsersController < ApplicationController
       responds_to_parent do
         # Without return RSpec2 screams bloody murder about rendering twice:
         # within the block and after yield in responds_to_parent.
-        render and (return if Rails.env.test?)
+        render && (return if Rails.env.test?)
       end
     end
   end
@@ -122,7 +121,7 @@ class UsersController < ApplicationController
   #----------------------------------------------------------------------------
   def redraw
     current_user.preference[:locale] = params[:locale]
-    render :js => %Q{window.location.href = "#{user_path(current_user)}";}
+    render js: %(window.location.href = "#{user_path(current_user)}";)
   end
 
   # GET /users/opportunities_overview
@@ -132,4 +131,29 @@ class UsersController < ApplicationController
     @unassigned_opportunities = Opportunity.my.unassigned.pipeline.order(:stage)
   end
 
+  protected
+
+  def user_params
+    params[:user].permit(
+      :username,
+      :email,
+      :first_name,
+      :last_name,
+      :title,
+      :company,
+      :alt_email,
+      :phone,
+      :mobile,
+      :aim,
+      :yahoo,
+      :google,
+      :skype
+    )
+  end
+
+  def avatar_params
+    params[:avatar]
+      .permit(:image)
+      .merge(entity: @user)
+  end
 end

data/app/helpers/accounts_helper.rb

@@ -4,7 +4,6 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module AccountsHelper
-
   # Sidebar checkbox control for filtering accounts by category.
   #----------------------------------------------------------------------------
   def account_category_checkbox(category, count)
@@ -14,11 +13,11 @@ module AccountsHelper
   # Quick account summary for RSS/ATOM feeds.
   #----------------------------------------------------------------------------
   def account_summary(account)
-    [ number_to_currency(account.opportunities.pipeline.map(&:weighted_amount).sum, :precision => 0),
-      t(:added_by, :time_ago => time_ago_in_words(account.created_at), :user => account.user_id_full_name),
-      t('pluralize.contact', account.contacts.count),
-      t('pluralize.opportunity', account.opportunities.count),
-      t('pluralize.comment', account.comments.count)
+    [number_to_currency(account.opportunities.pipeline.map(&:weighted_amount).sum, precision: 0),
+     t(:added_by, time_ago: time_ago_in_words(account.created_at), user: account.user_id_full_name),
+     t('pluralize.contact', account.contacts.count),
+     t('pluralize.opportunity', account.opportunities.count),
+     t('pluralize.comment', account.comments.count)
     ].join(', ')
   end
 
@@ -26,37 +25,37 @@ module AccountsHelper
   # and prepends the currently selected account, if any.
   #----------------------------------------------------------------------------
   def account_select(options = {})
-      options[:selected] = (@account && @account.id) || 0
-      accounts = ([@account] + Account.my.order(:name).limit(25)).compact.uniq
-      collection_select :account, :id, accounts, :id, :name, options,
-                        {:"data-placeholder" => t(:select_an_account),
-                         :"data-url" => auto_complete_accounts_path(format: 'json'),
-                         :style => "width:330px; display:none;",
-                         :class => 'ajax_chosen' }
+    options[:selected] = (@account && @account.id) || 0
+    accounts = ([@account] + Account.my.order(:name).limit(25)).compact.uniq
+    collection_select :account, :id, accounts, :id, :name, options,
+                      :"data-placeholder" => t(:select_an_account),
+                      :"data-url" => auto_complete_accounts_path(format: 'json'),
+                      style: "width:330px; display:none;",
+                      class: 'ajax_chosen'
   end
 
   # Select an existing account or create a new one.
   #----------------------------------------------------------------------------
-  def account_select_or_create(form, &block)
+  def account_select_or_create(form, &_block)
     options = {}
     yield options if block_given?
 
-    content_tag(:div, :class => 'label') do
+    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.select_account(); return false;'>#{t :select_existing}</a>):".html_safe
-      end +
+        content_tag(:span, id: 'account_create_title') do
+          "(#{t :create_new} #{t :or} <a href='#' onclick='crm.select_account(); return false;'>#{t :select_existing}</a>):".html_safe
+        end +
 
-      content_tag(:span, :id => 'account_select_title') do
-        "(<a href='#' onclick='crm.create_account(); return false;'>#{t :create_new}</a> #{t :or} #{t :select_existing}):".html_safe
-      end +
+        content_tag(:span, id: 'account_select_title') do
+          "(<a href='#' onclick='crm.create_account(); return false;'>#{t :create_new}</a> #{t :or} #{t :select_existing}):".html_safe
+        end +
 
-      content_tag(:span, ':', :id => 'account_disabled_title')
+        content_tag(:span, ':', id: 'account_disabled_title')
     end +
 
-    account_select(options) +
-    form.text_field(:name, :style => 'width:324px; display:none;')
+      account_select(options) +
+      form.text_field(:name, style: 'width:324px; display:none;')
   end
 
   # Output account url for a given contact
@@ -71,14 +70,14 @@ module AccountsHelper
   #----------------------------------------------------------------------------
   def account_with_title_and_department(contact)
     text = if !contact.title.blank? && contact.account
-        # works_at: "{{h(job_title)}} at {{h(company)}}"
-        content_tag :div, t(:works_at, :job_title => h(contact.title), :company => h(account_with_url_for(contact))).html_safe
-      elsif !contact.title.blank?
-        content_tag :div, h(contact.title)
-      elsif contact.account
-        content_tag :div, account_with_url_for(contact)
-      else
-        ""
+             # works_at: "{{h(job_title)}} at {{h(company)}}"
+             content_tag :div, t(:works_at, job_title: h(contact.title), company: h(account_with_url_for(contact))).html_safe
+           elsif !contact.title.blank?
+             content_tag :div, h(contact.title)
+           elsif contact.account
+             content_tag :div, account_with_url_for(contact)
+           else
+             ""
       end
     text << t(:department_small, h(contact.department)) unless contact.department.blank?
     text
@@ -96,17 +95,16 @@ module AccountsHelper
     account_text = link_to_if(can?(:read, account), h(account.name), account_path(account)) if account.present?
 
     text << if title.present? && department.present?
-          t(:account_with_title_department, :title => h(title), :department => h(department), :account => account_text)
-        elsif title.present?
-          t(:account_with_title, :title => h(title), :account => account_text)
-        elsif department.present?
-          t(:account_with_title, :title => h(department), :account => account_text)
-        elsif account_text.present?
-          t(:works_at, :job_title => "", :company => account_text)
-        else
-          ""
+              t(:account_with_title_department, title: h(title), department: h(department), account: account_text)
+            elsif title.present?
+              t(:account_with_title, title: h(title), account: account_text)
+            elsif department.present?
+              t(:account_with_title, title: h(department), account: account_text)
+            elsif account_text.present?
+              t(:works_at, job_title: "", company: account_text)
+            else
+              ""
         end
     text.html_safe
   end
-
 end

data/app/helpers/addresses_helper.rb

@@ -4,16 +4,14 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module AddressesHelper
-
   # Sets up new address when used in forms.
   #----------------------------------------------------------------------------
   def get_address(asset, type)
     asset.send("build_#{type}".to_sym) if asset.send(type.to_sym).nil?
     asset.send(type.to_sym)
   end
-  
+
   def priority_countries
     Setting[:priority_countries]
   end
-
 end

data/app/helpers/admin/application_helper.rb

@@ -4,12 +4,12 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module Admin::ApplicationHelper
- #----------------------------------------------------------------------------
+  #----------------------------------------------------------------------------
   def link_to_confirm_delete(model)
     link_to(t(:yes_button),
-      url_for([:admin, model]),
-      :method  => :delete,
-      :remote  => true
+            url_for([:admin, model]),
+            method:  :delete,
+            remote:  true
     )
   end
 end

data/app/helpers/admin/field_groups_helper.rb

@@ -4,24 +4,22 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module Admin::FieldGroupsHelper
-
   include ::ERB::Util
 
   def field_group_subtitle(field_group)
     asset = field_group.klass_name.downcase
-    html = t(field_group.name, :default => h(field_group.label)).html_safe
-    html << content_tag(:small, :id => "#{asset}_field_group_#{field_group.id}_intro") do
+    html = t(field_group.name, default: h(field_group.label)).html_safe
+    html << content_tag(:small, id: "#{asset}_field_group_#{field_group.id}_intro") do
       if field_group.tag_id
-        t(:field_group_tag_restriction, :assets => asset.pluralize, :tag => field_group.tag.try(:name))
+        t(:field_group_tag_restriction, assets: asset.pluralize, tag: field_group.tag.try(:name))
       else
-        t(:field_group_unrestricted, :assets => asset.pluralize)
+        t(:field_group_unrestricted, assets: asset.pluralize)
       end
     end
     html
   end
 
   def link_to_confirm(field_group)
-    link_to(t(:delete) + "?", confirm_admin_field_group_path(field_group), :method => :get, :remote => true)
+    link_to(t(:delete) + "?", confirm_admin_field_group_path(field_group), method: :get, remote: true)
   end
-
 end

data/app/helpers/admin/fields_helper.rb

@@ -4,16 +4,15 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module Admin::FieldsHelper
-
   # Returns the list of :null and :safe database column transitions.
   # Only these options should be shown on the custom field edit form.
   def field_edit_as_options(field = nil)
     # Return every available field_type if no restriction
     options = (field.as.present? ? field.available_as : Field.field_types).keys
-    options.map{|k| [t("field_types.#{k}.title"), k] }
+    options.map { |k| [t("field_types.#{k}.title"), k] }
   end
 
   def field_group_options
-    FieldGroup.all.map {|fg| [fg.name, fg.id]}
+    FieldGroup.all.map { |fg| [fg.name, fg.id] }
   end
 end

data/app/helpers/admin/plugins_helper.rb

@@ -5,4 +5,3 @@
 #------------------------------------------------------------------------------
 module Admin::PluginsHelper
 end
-

data/app/helpers/admin/settings_helper.rb

@@ -5,4 +5,3 @@
 #------------------------------------------------------------------------------
 module Admin::SettingsHelper
 end
-

data/app/helpers/admin/tags_helper.rb

@@ -5,6 +5,6 @@
 #------------------------------------------------------------------------------
 module Admin::TagsHelper
   def link_to_confirm(tag)
-    link_to(t(:delete) + "?", confirm_admin_tag_path(tag), :method => :get, :remote => true)
+    link_to(t(:delete) + "?", confirm_admin_tag_path(tag), method: :get, remote: true)
   end
 end

data/app/helpers/admin/users_helper.rb

@@ -4,20 +4,19 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module Admin::UsersHelper
-
   def link_to_suspend(user)
-    link_to(t(:suspend) + "!", suspend_admin_user_path(user), :method => :put, :remote => true)
+    link_to(t(:suspend) + "!", suspend_admin_user_path(user), method: :put, remote: true)
   end
 
   #----------------------------------------------------------------------------
   def link_to_reactivate(user)
     name = user.awaits_approval? ? t(:approve) + "!" : t(:reactivate) + "!"
-    link_to(name, reactivate_admin_user_path(user), :method => :put, :remote => true)
+    link_to(name, reactivate_admin_user_path(user), method: :put, remote: true)
   end
 
   #----------------------------------------------------------------------------
   def link_to_confirm(user)
-    link_to(t(:delete) + "?", confirm_admin_user_path(user), :method => :get, :remote => true)
+    link_to(t(:delete) + "?", confirm_admin_user_path(user), method: :get, remote: true)
   end
 
   # User summary info for RSS/ATOM feeds.
@@ -27,27 +26,26 @@ module Admin::UsersHelper
     title_and_company = user.title.blank? ? '' : h(user.title)
     title_and_company << " #{t(:at)} #{user.company}" unless user.company.blank?
     summary << title_and_company unless title_and_company.blank?
-    summary << t('pluralize.login', user.login_count) if user.last_request_at && user.login_count > 0
+    summary << t('pluralize.login', user.login_count) if user.current_login_at && user.login_count > 0
     summary << user.email
     summary << "#{t :phone_small}: #{user.phone}" unless user.phone.blank?
     summary << "#{t :mobile_small}: #{user.mobile}" unless user.mobile.blank?
     summary << if !user.suspended?
-      t(:user_since, l(user.created_at.to_date, :format => :mmddyy))
-    elsif user.awaits_approval?
-      t(:user_signed_up_on, l(user.created_at, :format => :mmddhhss))
-    else
-      t(:user_suspended_on, l(user.created_at.to_date, :format => :mmddyy))
+                 t(:user_since, l(user.created_at.to_date, format: :mmddyy))
+               elsif user.awaits_approval?
+                 t(:user_signed_up_on, l(user.created_at, format: :mmddhhss))
+               else
+                 t(:user_suspended_on, l(user.created_at.to_date, format: :mmddyy))
     end
     summary << if user.awaits_approval?
-      t(:user_signed_up)
-    elsif user.suspended?
-      t(:user_suspended)
-    elsif user.admin?
-      t(:user_admin)
-    else
-      t(:user_active)
+                 t(:user_signed_up)
+               elsif user.suspended?
+                 t(:user_suspended)
+               elsif user.admin?
+                 t(:user_admin)
+               else
+                 t(:user_active)
     end
     summary.join(', ')
   end
 end
-

data/app/helpers/application_helper.rb

@@ -4,44 +4,43 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module ApplicationHelper
-
   def tabs(tabs = nil)
     tabs ||= controller_path =~ /admin/ ? FatFreeCRM::Tabs.admin : FatFreeCRM::Tabs.main
     if tabs
       @current_tab ||= tabs.first[:text] # Select first tab by default.
       tabs.each { |tab| tab[:active] = (@current_tab == tab[:text] || @current_tab == tab[:url][:controller]) }
     else
-      raise FatFreeCRM::MissingSettings, "Tab settings are missing, please run <b>rake ffcrm:setup</b> command."
+      fail FatFreeCRM::MissingSettings, "Tab settings are missing, please run <b>rake ffcrm:setup</b> command."
     end
   end
 
   #----------------------------------------------------------------------------
   def tabless_layout?
     %w(authentications passwords).include?(controller.controller_name) ||
-    ((controller.controller_name == "users") && (%w(create new).include?(controller.action_name)))
+      ((controller.controller_name == "users") && (%w(create new).include?(controller.action_name)))
   end
 
   # Show existing flash or embed hidden paragraph ready for flash[:notice]
   #----------------------------------------------------------------------------
-  def show_flash(options = { :sticky => false })
+  def show_flash(options = { sticky: false })
     [:error, :warning, :info, :notice].each do |type|
       if flash[type]
-        html = content_tag(:div, h(flash[type]), :id => "flash")
+        html = content_tag(:div, h(flash[type]), id: "flash")
         flash[type] = nil
-        return html << content_tag(:script, "crm.flash('#{type}', #{options[:sticky]})".html_safe, :type => "text/javascript")
+        return html << content_tag(:script, "crm.flash('#{type}', #{options[:sticky]})".html_safe, type: "text/javascript")
       end
     end
-    content_tag(:p, nil, :id => "flash", :style => "display:none;")
+    content_tag(:p, nil, id: "flash", style: "display:none;")
   end
 
   #----------------------------------------------------------------------------
   def subtitle(id, hidden = true, text = id.to_s.split("_").last.capitalize)
     content_tag("div",
-      link_to("<small>#{ hidden ? "&#9658;" : "&#9660;" }</small> #{sanitize text}".html_safe,
-        url_for(:controller => :home, :action => :toggle, :id => id),
-        :remote => true,
-        :onclick => "crm.flip_subtitle(this)"
-      ), :class => "subtitle")
+                link_to("<small>#{ hidden ? '&#9658;' : '&#9660;' }</small> #{sanitize text}".html_safe,
+                        url_for(controller: :home, action: :toggle, id: id),
+                        remote: true,
+                        onclick: "crm.flip_subtitle(this)"
+                ), class: "subtitle")
   end
 
   #----------------------------------------------------------------------------
@@ -52,11 +51,11 @@ module ApplicationHelper
     create_url = controller.send(:"new_#{asset}_path")
 
     html = tag(:br)
-    html << content_tag(:div, link_to(t(select_id), "#", :id => select_id), :class => "subtitle_tools")
-    html << content_tag(:div, "&nbsp;|&nbsp;".html_safe, :class => "subtitle_tools")
-    html << content_tag(:div, link_to_inline(create_id, create_url, :related => dom_id(related), :text => t(create_id)), :class => "subtitle_tools")
-    html << content_tag(:div, t(assets), :class => :subtitle, :id => "create_#{asset}_title")
-    html << content_tag(:div, "", :class => :remote, :id => create_id, :style => "display:none;")
+    html << content_tag(:div, link_to(t(select_id), "#", id: select_id), class: "subtitle_tools")
+    html << content_tag(:div, "&nbsp;|&nbsp;".html_safe, class: "subtitle_tools")
+    html << content_tag(:div, link_to_inline(create_id, create_url, related: dom_id(related), text: t(create_id)), class: "subtitle_tools")
+    html << content_tag(:div, t(assets), class: :subtitle, id: "create_#{asset}_title")
+    html << content_tag(:div, "", class: :remote, id: create_id, style: "display:none;")
   end
 
   #----------------------------------------------------------------------------
@@ -69,36 +68,36 @@ module ApplicationHelper
 
   def generate_js_for_popups(related, *assets)
     assets.map do |asset|
-      render(:partial => "shared/select_popup", :locals => { :related => related, :popup => asset })
+      render(partial: "shared/select_popup", locals: { related: related, popup: asset })
     end.join
   end
 
   # We need this because standard Rails [select] turns &#9733; into &amp;#9733;
   #----------------------------------------------------------------------------
   def rating_select(name, options = {})
-    stars = Hash[ (1..5).map { |star| [ star, "&#9733;" * star ] } ].sort
-    options_for_select = %Q(<option value="0"#{options[:selected].to_i == 0 ? ' selected="selected"' : ''}>#{t :select_none}</option>)
+    stars = Hash[(1..5).map { |star| [star, "&#9733;" * star] }].sort
+    options_for_select = %(<option value="0"#{options[:selected].to_i == 0 ? ' selected="selected"' : ''}>#{t :select_none}</option>)
     options_for_select << stars.map { |star| %(<option value="#{star.first}"#{options[:selected] == star.first ? ' selected="selected"' : ''}>#{star.last}</option>) }.join
     select_tag name, options_for_select.html_safe, options
   end
 
   #----------------------------------------------------------------------------
   def link_to_inline(id, url, options = {})
-    text = options[:text] || t(id, :default => id.to_s.titleize)
+    text = options[:text] || t(id, default: id.to_s.titleize)
     text = (arrow_for(id) + text) unless options[:plain]
     related = (options[:related] ? "&related=#{options[:related]}" : '')
 
     link_to(text,
-      url + "#{url.include?('?') ? '&' : '?'}cancel=false" + related,
-      :remote => true,
-      :onclick => "this.href = this.href.replace(/cancel=(true|false)/,'cancel='+ ($('##{id}').css('display') != 'none'));",
-      :class => options[:class]
+            url + "#{url.include?('?') ? '&' : '?'}cancel=false" + related,
+            remote: true,
+            onclick: "this.href = this.href.replace(/cancel=(true|false)/,'cancel='+ ($('##{id}').css('display') != 'none'));",
+            class: options[:class]
     )
   end
 
   #----------------------------------------------------------------------------
   def arrow_for(id)
-    content_tag(:span, "&#9658;".html_safe, :id => "#{id}_arrow", :class => :arrow)
+    content_tag(:span, "&#9658;".html_safe, id: "#{id}_arrow", class: :arrow)
   end
 
   #----------------------------------------------------------------------------
@@ -107,9 +106,9 @@ module ApplicationHelper
 
     name = (params[:klass_name] || object.class.name).underscore.downcase
     link_to(t(:edit),
-      options[:url] || polymorphic_url(record, :action => :edit),
-      :remote  => true,
-      :onclick => "this.href = this.href.split('?')[0] + '?previous='+crm.find_form('edit_#{h name}');".html_safe
+            options[:url] || polymorphic_url(record, action: :edit),
+            remote:  true,
+            onclick: "this.href = this.href.split('?')[0] + '?previous='+crm.find_form('edit_#{h name}');".html_safe
     )
   end
 
@@ -119,22 +118,22 @@ module ApplicationHelper
     confirm = options[:confirm] || nil
 
     link_to(t(:delete) + "!",
-      options[:url] || url_for(record),
-      :method => :delete,
-      :remote => true,
-      :confirm => confirm
+            options[:url] || url_for(record),
+            method: :delete,
+            remote: true,
+            confirm: confirm
     )
   end
 
   #----------------------------------------------------------------------------
   def link_to_discard(object)
     current_url = (request.xhr? ? request.referer : request.fullpath)
-    parent, parent_id = current_url.scan(%r|/(\w+)/(\d+)|).flatten
+    parent, parent_id = current_url.scan(%r{/(\w+)/(\d+)}).flatten
 
     link_to(t(:discard),
-      url_for(:controller => parent, :action => :discard, :id => parent_id, :attachment => object.class.name, :attachment_id => object.id),
-      :method  => :post,
-      :remote  => true
+            url_for(controller: parent, action: :discard, id: parent_id, attachment: object.class.name, attachment_id: object.id),
+            method:  :post,
+            remote:  true
     )
   end
 
@@ -142,61 +141,72 @@ module ApplicationHelper
   def link_to_cancel(url, params = {})
     url = params[:url] if params[:url]
     link_to(t(:cancel),
-      url + "#{url.include?('?') ? '&' : '?'}cancel=true",
-      :remote => true
+            url + "#{url.include?('?') ? '&' : '?'}cancel=true",
+            remote: true
     )
   end
 
   #----------------------------------------------------------------------------
   def link_to_close(url)
     link_to("x", url + "#{url.include?('?') ? '&' : '?'}cancel=true",
-      :remote => true,
-      :class => "close",
-      :title => t(:close_form)
+            remote: true,
+            class: "close",
+            title: t(:close_form)
     )
   end
 
   # Bcc: to dropbox address if the dropbox has been set up.
   #----------------------------------------------------------------------------
-  def link_to_email(email, length = nil, &block)
-    name = (length ? truncate(email, :length => length) : email)
+  def link_to_email(email, length = nil, &_block)
+    name = (length ? truncate(email, length: length) : email)
     if Setting.email_dropbox && Setting.email_dropbox[:address].present?
       mailto = "#{email}?bcc=#{Setting.email_dropbox[:address]}"
     else
       mailto = email
     end
     if block_given?
-      link_to("mailto:#{mailto}", :title => email) do
+      link_to("mailto:#{mailto}", title: email) do
         yield
       end
     else
-      link_to(h(name), "mailto:#{mailto}", :title => email)
+      link_to(h(name), "mailto:#{mailto}", title: email)
     end
   end
 
   #----------------------------------------------------------------------------
   def jumpbox(current)
-    tabs = [ :campaigns, :accounts, :leads, :contacts, :opportunities ]
+    tabs = [:campaigns, :accounts, :leads, :contacts, :opportunities]
     current = tabs.first unless tabs.include?(current)
     tabs.map do |tab|
-      link_to_function(t("tab_#{tab}"), "crm.jumper('#{tab}')", "html-data" => tab, :class => (tab == current ? 'selected' : ''))
+      link_to_function(t("tab_#{tab}"), "crm.jumper('#{tab}')", "html-data" => tab, class: (tab == current ? 'selected' : ''))
     end.join(" | ").html_safe
   end
 
   #----------------------------------------------------------------------------
   def styles_for(*models)
-    render :partial => "shared/inline_styles", :locals => { :models => models }
+    render partial: "shared/inline_styles", locals: { models: models }
   end
 
   #----------------------------------------------------------------------------
-  def hidden;    { :style => "display:none;"       }; end
-  def exposed;   { :style => "display:block;"      }; end
-  def invisible; { :style => "visibility:hidden;"  }; end
-  def visible;   { :style => "visibility:visible;" }; end
+  def hidden
+    { style: "display:none;"       }
+  end
+
+  def exposed
+    { style: "display:block;"      }
+  end
+
+  def invisible
+    { style: "visibility:hidden;"  }
+  end
+
+  def visible
+    { style: "visibility:visible;" }
+  end
 
   #----------------------------------------------------------------------------
-  def one_submit_only(form='')
-    { :onsubmit => "$('#'+this.id+' input[type=submit]').prop('disabled', true)".html_safe }
+  def one_submit_only(_form = '')
+    { onsubmit: "$('#'+this.id+' input[type=submit]').prop('disabled', true)".html_safe }
   end
 
   #----------------------------------------------------------------------------
@@ -212,7 +222,7 @@ module ApplicationHelper
   #----------------------------------------------------------------------------
   def confirm_delete(model, params = {})
     question = %(<span class="warn">#{t(:confirm_delete, model.class.to_s.downcase)}</span>)
-    yes = link_to(t(:yes_button), params[:url] || model, :method => :delete)
+    yes = link_to(t(:yes_button), params[:url] || model, method: :delete)
     no = link_to_function(t(:no_button), "$('#menu').html($('#confirm').html());")
     text = "$('#confirm').html( $('#menu').html() );\n"
     text << "$('#menu').html('#{question} #{yes} : #{no}');"
@@ -221,7 +231,7 @@ module ApplicationHelper
 
   #----------------------------------------------------------------------------
   def spacer(width = 10)
-    image_tag "1x1.gif", :width => width, :height => 1, :alt => nil
+    image_tag "1x1.gif", width: width, height: 1, alt: nil
   end
 
   # Reresh sidebar using the action view within the current controller.
@@ -234,7 +244,7 @@ module ApplicationHelper
   #----------------------------------------------------------------------------
   def refresh_sidebar_for(view, action = nil, shake = nil)
     text = ""
-    text << "$('#sidebar').html('#{ j render(:partial => "layouts/sidebar", :locals => { :view => view, :action => action }) }');"
+    text << "$('#sidebar').html('#{ j render(partial: 'layouts/sidebar', locals: { view: view, action: action }) }');"
     text << "$('##{j shake.to_s}').effect('shake', { duration:200, distance: 3 });" if shake
     text.html_safe
   end
@@ -242,15 +252,15 @@ module ApplicationHelper
   # Display web presence mini-icons for Contact or Lead.
   #----------------------------------------------------------------------------
   def web_presence_icons(person)
-    [ :blog, :linkedin, :facebook, :twitter, :skype ].map do |site|
+    [:blog, :linkedin, :facebook, :twitter, :skype].map do |site|
       url = person.send(site)
       unless url.blank?
-        if site == :skype then
+        if site == :skype
           url = "callto:" << url
         else
           url = "http://" << url unless url.match(/^https?:\/\//)
         end
-        link_to(image_tag("#{site}.gif", :size => "15x15"), h(url), :"data-popup" => true, :title => t(:open_in_window, h(url)))
+        link_to(image_tag("#{site}.gif", size: "15x15"), h(url), :"data-popup" => true, title: t(:open_in_window, h(url)))
       end
     end.compact.join("\n").html_safe
   end
@@ -261,7 +271,7 @@ module ApplicationHelper
     if value.is_a?(Array)
       param, value = value.first, value.last
     end
-    %Q{
+    %{
       if ($('##{option}').html() != '#{value}') {
         $('##{option}').html('#{value}');
         $('#loading').show();
@@ -276,15 +286,15 @@ module ApplicationHelper
   def options_menu_item(option, key, url = send("redraw_#{controller.controller_name}_path"))
     name = t("option_#{key}")
     "{ name: \"#{name.titleize}\", on_select: function() {" +
-    %Q{
-      if ($('##{option}').html() != '#{name}') {
-        $('##{option}').html('#{name}');
-        $('#loading').show();
-        $.get('#{url}', {#{option}: '#{key}', query: $('#query').val()}, function () {
-          $('#loading').hide();
-        });
-      }
-    } + "}}"
+      %{
+        if ($('##{option}').html() != '#{name}') {
+          $('##{option}').html('#{name}');
+          $('#loading').show();
+          $.get('#{url}', {#{option}: '#{key}', query: $('#query').val()}, function () {
+            $('#loading').hide();
+          });
+        }
+      } + "}}"
   end
 
   # Ajax helper to pass browser timezone offset to the server.
@@ -300,15 +310,13 @@ module ApplicationHelper
   # publically available: http://en.gravatar.com/site/implement/images
   #----------------------------------------------------------------------------
   def avatar_for(model, args = {})
-    args = { :class => 'gravatar', :size => :large }.merge(args)
-
-    if model.respond_to?(:avatar) and model.avatar.present?
-      image_tag(model.avatar.image.url(args[:size]), args)
+    args = { class: 'gravatar', size: :large }.merge(args)
+    if model.respond_to?(:avatar) && model.avatar.present?
+      image_tag(model.avatar.image.url(args.delete(:size)), args)
     else
       args = Avatar.size_from_style!(args) # convert size format :large => '75x75'
       gravatar_image_tag(model.email, args)
     end
-
   end
 
   # Returns default permissions intro.
@@ -327,13 +335,13 @@ module ApplicationHelper
     hint = "#{t(attribute)}..."
     if object.send(attribute).blank?
       form.text_field(attribute,
-        :style   => "margin-top: 6px; #{extra_styles}",
-        :placeholder => hint
+                      style:   "margin-top: 6px; #{extra_styles}",
+                      placeholder: hint
       )
     else
       form.text_field(attribute,
-        :style   => "margin-top: 6px; #{extra_styles}",
-        :placeholder => hint
+                      style:   "margin-top: 6px; #{extra_styles}",
+                      placeholder: hint
       )
     end
   end
@@ -344,42 +352,42 @@ module ApplicationHelper
   #   - we're actually showing asset landing page.
   #----------------------------------------------------------------------------
   def shown_on_landing_page?
-    !!((request.xhr? && request.referer =~ %r|/\w+/\d+|) ||
-       (!request.xhr? && request.fullpath =~ %r|/\w+/\d+|))
+    !!((request.xhr? && request.referer =~ %r{/\w+/\d+}) ||
+       (!request.xhr? && request.fullpath =~ %r{/\w+/\d+}))
   end
 
   # Helper to display links to supported data export formats.
   #----------------------------------------------------------------------------
-  def links_to_export(action=:index)
+  def links_to_export(action = :index)
     token = current_user.single_access_token
-    url_params = {:action => action}
-    url_params.merge!(:id => params[:id]) unless params[:id].blank?
-    url_params.merge!(:query => params[:query]) unless params[:query].blank?
-    url_params.merge!(:q => params[:q]) unless params[:q].blank?
-    url_params.merge!(:view => @view) unless @view.blank? # tasks
-    url_params.merge!(:id => params[:id]) unless params[:id].blank?
+    url_params = { action: action }
+    url_params.merge!(id: params[:id]) unless params[:id].blank?
+    url_params.merge!(query: params[:query]) unless params[:query].blank?
+    url_params.merge!(q: params[:q]) unless params[:q].blank?
+    url_params.merge!(view: @view) unless @view.blank? # tasks
+    url_params.merge!(id: params[:id]) unless params[:id].blank?
 
     exports = %w(xls csv).map do |format|
-      link_to(format.upcase, url_params.merge(:format => format), :title => I18n.t(:"to_#{format}")) unless action.to_s == "show"
+      link_to(format.upcase, url_params.merge(format: format), title: I18n.t(:"to_#{format}")) unless action.to_s == "show"
     end
 
     feeds = %w(rss atom).map do |format|
-      link_to(format.upcase, url_params.merge(:format => format, :authentication_credentials => token), :title => I18n.t(:"to_#{format}"))
+      link_to(format.upcase, url_params.merge(format: format, authentication_credentials: token), title: I18n.t(:"to_#{format}"))
     end
 
-    links = %W(perm).map do |format|
-      link_to(format.upcase, url_params, :title => I18n.t(:"to_#{format}"))
+    links = %w(perm).map do |format|
+      link_to(format.upcase, url_params, title: I18n.t(:"to_#{format}"))
     end
 
     (exports + feeds + links).compact.join(' | ')
   end
 
   def user_options
-    User.all.map {|u| [u.full_name, u.id]}
+    User.all.map { |u| [u.full_name, u.id] }
   end
 
   def group_options
-    Group.all.map {|g| [g.name, g.id]}
+    Group.all.map { |g| [g.name, g.id] }
   end
 
   def list_of_entities
@@ -388,8 +396,8 @@ module ApplicationHelper
 
   def entity_filter_checkbox(name, value, count)
     checked = (session["#{controller_name}_filter"].present? ? session["#{controller_name}_filter"].split(",").include?(value.to_s) : count.to_i > 0)
-    url = url_for(:action => :filter)
-    onclick = %Q{
+    url = url_for(action: :filter)
+    onclick = %{
       var query = $('#query').val(),
           values = [];
       $('input[name=&quot;#{h name}[]&quot;]').filter(':checked').each(function () {
@@ -400,13 +408,13 @@ module ApplicationHelper
         $('#loading').hide();
       });
     }.html_safe
-    check_box_tag("#{name}[]", value, checked, :id => value, :onclick => onclick)
+    check_box_tag("#{name}[]", value, checked, id: value, onclick: onclick)
   end
 
   # Create a column in the 'asset_attributes' table.
   # If a block is given, render it inside the td
   #----------------------------------------------------------------------------
-  def col(title, value = nil, last = false, email = false, &block)
+  def col(title, value = nil, last = false, email = false, &_block)
     last_class = (last ? 'last' : nil)
     out = content_tag(:th, title, class: last_class)
     if block_given?
@@ -417,9 +425,9 @@ module ApplicationHelper
       # Parse and format urls as links.
       fmt_value = (value.to_s || "").gsub("\n", "<br />")
       fmt_value = if email
-        link_to_email(fmt_value)
-      else
-        fmt_value.gsub(/((http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&amp;:\/\+#]*[\w\-\@?^=%&amp;\/\+#])?)/, "<a href=\"\\1\">\\1</a>")
+                    link_to_email(fmt_value)
+                  else
+                    fmt_value.gsub(/((http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&amp;:\/\+#]*[\w\-\@?^=%&amp;\/\+#])?)/, "<a href=\"\\1\">\\1</a>")
       end
       out << content_tag(:td, fmt_value, class: last_class)
     end
@@ -429,14 +437,14 @@ module ApplicationHelper
   #----------------------------------------------------------------------------
   # Combines the 'subtitle' helper with the small info text on the same line.
   def section_title(id, hidden = true, text = nil, info_text = nil)
-    text = id.to_s.split("_").last.capitalize if text == nil
-    content_tag("div", :class => "subtitle show_attributes") do
-      content = link_to("<small>#{ hidden ? "&#9658;" : "&#9660;" }</small> #{sanitize text}".html_safe,
-        url_for(:controller => :home, :action => :toggle, :id => id),
-        :remote  => true,
-        :onclick => "crm.flip_subtitle(this)"
+    text = id.to_s.split("_").last.capitalize if text.nil?
+    content_tag("div", class: "subtitle show_attributes") do
+      content = link_to("<small>#{ hidden ? '&#9658;' : '&#9660;' }</small> #{sanitize text}".html_safe,
+                        url_for(controller: :home, action: :toggle, id: id),
+                        remote:  true,
+                        onclick: "crm.flip_subtitle(this)"
       )
-      content << content_tag("small", info_text.to_s, {:class => "subtitle_inline_info", :id => "#{id}_intro", :style => hidden ? "" : "display:none;"})
+      content << content_tag("small", info_text.to_s, class: "subtitle_inline_info", id: "#{id}_intro", style: hidden ? "" : "display:none;")
     end
   end
 
@@ -453,7 +461,7 @@ module ApplicationHelper
   def template_for_current_view
     controller = params['controller']
     action = (params['action'] == 'show') ? 'show' : 'index' # create update redraw filter index actions all use index view
-    template = FatFreeCRM::ViewFactory.template_for_current_view(:controller => controller, :action => action, :name => current_view_name)
+    template = FatFreeCRM::ViewFactory.template_for_current_view(controller: controller, action: action, name: current_view_name)
     template
   end
 
@@ -462,19 +470,19 @@ module ApplicationHelper
   def view_buttons
     controller = params['controller']
     action = (params['action'] == 'show') ? 'show' : 'index' # create update redraw filter index actions all use index view
-    views = FatFreeCRM::ViewFactory.views_for(:controller => controller, :action => action)
+    views = FatFreeCRM::ViewFactory.views_for(controller: controller, action: action)
     return nil unless views.size > 1
     lis = ''.html_safe
-    content_tag :ul, :class => 'format-buttons' do
+    content_tag :ul, class: 'format-buttons' do
       views.collect do |view|
-        classes = if (current_view_name == view.name) or (current_view_name == nil and view.template == nil) # nil indicates default template.
-            "#{h view.name}-button active"
-          else
-            "#{h view.name}-button"
+        classes = if (current_view_name == view.name) || (current_view_name.nil? && view.template.nil?) # nil indicates default template.
+                    "#{h view.name}-button active"
+                  else
+                    "#{h view.name}-button"
           end
         lis << content_tag(:li) do
           url = (action == "index") ? send("redraw_#{controller}_path") : send("#{controller.singularize}_path")
-          link_to('#', :title => t(view.name, :default => h(view.title)), :"data-view" => h(view.name), :"data-url" => h(url), :"data-context" => action, :class => classes) do
+          link_to('#', title: t(view.name, default: h(view.title)), :"data-view" => h(view.name), :"data-url" => h(url), :"data-context" => action, class: classes) do
             icon = view.icon || 'fa-bars'
             content_tag(:i, nil, class: "fa #{h icon}")
           end
@@ -489,7 +497,7 @@ module ApplicationHelper
   # <span class="timeago" datetime="2008-07-17T09:24:17Z">July 17, 2008</span>
   def timeago(time, options = {})
     options[:class] ||= "timeago"
-    content_tag(:span, h(time.to_s), options.merge( title: time.getutc.iso8601)) if time
+    content_tag(:span, h(time.to_s), options.merge(title: time.getutc.iso8601)) if time
   end
 
   #----------------------------------------------------------------------------
@@ -512,8 +520,8 @@ module ApplicationHelper
   #         options = { renderer: {...} , params: {...}
   def paginate(options = {})
     collection = options.delete(:collection)
+    options = { params: { action: 'index'}}.merge(options) if params['action'] == 'filter'
     options = { renderer: RemoteLinkPaginationHelper::LinkRenderer }.merge(options)
     will_paginate(collection, options)
   end
-
 end