fat_free_crm 0.16.4 → 0.17.1

data/app/controllers/entities_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.
@@ -109,7 +111,7 @@ class EntitiesController < ApplicationController
 
   #----------------------------------------------------------------------------
   def entities
-    instance_variable_get("@#{controller_name}") || klass.my
+    instance_variable_get("@#{controller_name}") || klass.my(current_user)
   end
 
   def set_options
@@ -171,6 +173,8 @@ class EntitiesController < ApplicationController
       scope = scope.paginate(page: current_page, per_page: per_page)
     end
 
+    scope = scope.includes(*list_includes) if respond_to?(:list_includes, true)
+
     scope
   end
 
@@ -212,4 +216,14 @@ class EntitiesController < ApplicationController
       current_user.pref[:"#{controller}_#{action}_view"] = params['view']
     end
   end
+
+  def per_page_param
+    per_page = params[:per_page]&.to_i
+    [1, [per_page, 200].min].max if per_page
+  end
+
+  def page_param
+    page = params[:page]&.to_i
+    [0, page].max if page
+  end
 end

data/app/controllers/home_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 HomeController < ApplicationController
-  before_action :require_user, except: %i[toggle timezone]
+  before_action :require_user, except: %i[timezone]
   before_action :set_current_tab, only: :index
 
   #----------------------------------------------------------------------------
@@ -45,10 +47,13 @@ class HomeController < ApplicationController
   # GET /home/toggle                                                       AJAX
   #----------------------------------------------------------------------------
   def toggle
-    if session[params[:id].to_sym]
-      session.delete(params[:id].to_sym)
-    else
-      session[params[:id].to_sym] = true
+    if (toggle_param = params[:id]&.to_sym)
+      session[:toggle_states] ||= {}
+      if session[:toggle_states][toggle_param]
+        session[:toggle_states].delete(toggle_param)
+      else
+        session[:toggle_states][toggle_param] = true
+      end
     end
     head :ok
   end

data/app/controllers/lists_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.
@@ -7,11 +9,7 @@ class ListsController < ApplicationController
   # POST /lists
   #----------------------------------------------------------------------------
   def create
-    if params[:is_global].to_i.zero?
-      list_params[:user_id] = current_user.id
-    else
-      list_params[:user_id] = nil
-    end
+    list_params[:user_id] = (current_user.id if params[:is_global].to_i.zero?)
 
     # Find any existing list with the same name (case insensitive)
     if @list = List.where("lower(name) = ?", list_params[:name].downcase).where(user_id: list_params[:user_id]).first

data/app/controllers/passwords_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.
@@ -60,6 +62,6 @@ class PasswordsController < ApplicationController
   #----------------------------------------------------------------------------
   def empty_password?
     (params[:user][:password] == params[:user][:password_confirmation]) &&
-      params[:user][:password].blank?      # "   ".blank? == true
+      params[:user][:password].blank? # "   ".blank? == true
   end
 end

data/app/controllers/tasks_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.
@@ -38,7 +40,7 @@ class TasksController < ApplicationController
 
     if params[:related]
       model, id = params[:related].split(/_(\d+)/)
-      if related = model.classify.constantize.my.find_by_id(id)
+      if related = model.classify.constantize.my(current_user).find_by_id(id)
         instance_variable_set("@asset", related)
       else
         respond_to_related_not_found(model) && return
@@ -84,11 +86,11 @@ class TasksController < ApplicationController
     @task = Task.tracked_by(current_user).find(params[:id])
     @task_before_update = @task.dup
 
-    if @task.due_at && (@task.due_at < Date.today.to_time)
-      @task_before_update.bucket = "overdue"
-    else
-      @task_before_update.bucket = @task.computed_bucket
-    end
+    @task_before_update.bucket = if @task.due_at && (@task.due_at < Date.today.to_time)
+                                   "overdue"
+                                 else
+                                   @task.computed_bucket
+                                 end
 
     respond_with(@task) do |_format|
       if @task.update_attributes(task_params)
@@ -123,7 +125,7 @@ class TasksController < ApplicationController
   #----------------------------------------------------------------------------
   def complete
     @task = Task.tracked_by(current_user).find(params[:id])
-    @task.update_attributes(completed_at: Time.now, completed_by: current_user.id) if @task
+    @task&.update_attributes(completed_at: Time.now, completed_by: current_user.id)
 
     # Make sure bucket's div gets hidden if it's the last completed task in the bucket.
     if Task.bucket_empty?(params[:bucket], current_user)
@@ -138,7 +140,7 @@ class TasksController < ApplicationController
   #----------------------------------------------------------------------------
   def uncomplete
     @task = Task.tracked_by(current_user).find(params[:id])
-    @task.update_attributes(completed_at: nil, completed_by: nil) if @task
+    @task&.update_attributes(completed_at: nil, completed_by: nil)
 
     # Make sure bucket's div gets hidden if we're deleting last task in the bucket.
     if Task.bucket_empty?(params[:bucket], current_user, @view)
@@ -194,7 +196,7 @@ class TasksController < ApplicationController
     # Update filters session if we added, deleted, or completed a task.
     if @task
       update_session do |filters|
-        if @empty_bucket  # deleted, completed, rescheduled, or reassigned and need to hide a bucket
+        if @empty_bucket # deleted, completed, rescheduled, or reassigned and need to hide a bucket
           filters.delete(@empty_bucket)
         elsif !@task.deleted_at && !@task.completed_at # created new task
           filters << @task.computed_bucket

data/app/controllers/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.
@@ -54,6 +56,7 @@ class UsersController < ApplicationController
   #----------------------------------------------------------------------------
   def update
     @user.update_attributes(user_params)
+    flash[:notice] = t(:msg_user_updated)
     respond_with(@user)
   end
 
@@ -128,7 +131,7 @@ class UsersController < ApplicationController
   #----------------------------------------------------------------------------
   def opportunities_overview
     @users_with_opportunities = User.have_assigned_opportunities.order(:first_name)
-    @unassigned_opportunities = Opportunity.my.unassigned.pipeline.order(:stage)
+    @unassigned_opportunities = Opportunity.my(current_user).unassigned.pipeline.order(:stage).includes(:account, :user, :tags)
   end
 
   protected

data/app/helpers/accounts_helper.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.
@@ -15,23 +17,20 @@ module AccountsHelper
   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)
-    ].join(', ')
+     t('pluralize.contact', account.contacts_count),
+     t('pluralize.opportunity', account.opportunities_count),
+     t('pluralize.comment', account.comments.count)].join(', ')
   end
 
   # Generates a select list with the first 25 accounts
   # 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&.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'
   end
 
   # Select an existing account or create a new one.
@@ -42,18 +41,14 @@ 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.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.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 +
-
       account_select(options) +
       form.text_field(:name, style: 'width:324px; display:none;')
   end
@@ -79,7 +74,7 @@ module AccountsHelper
            else
              ""
       end
-    text << t(:department_small, h(contact.department)) unless contact.department.blank?
+    text += t(:department_small, h(contact.department)) unless contact.department.blank?
     text
   end
 
@@ -94,7 +89,7 @@ module AccountsHelper
     account_text = ""
     account_text = link_to_if(can?(:read, account), h(account.name), account_path(account)) if account.present?
 
-    text << if title.present? && department.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)

data/app/helpers/addresses_helper.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/helpers/admin/application_helper.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,6 @@ module Admin::ApplicationHelper
     link_to(t(:yes_button),
             url_for([:admin, model]),
             method:  :delete,
-            remote:  true
-    )
+            remote:  true)
   end
 end

data/app/helpers/admin/field_groups_helper.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/helpers/admin/fields_helper.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/helpers/admin/plugins_helper.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/helpers/admin/settings_helper.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/helpers/admin/tags_helper.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/helpers/admin/users_helper.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.
@@ -23,29 +25,47 @@ module Admin::UsersHelper
   #----------------------------------------------------------------------------
   def user_summary(user)
     summary = []
-    title_and_company = user.title.blank? ? '' : h(user.title)
-    title_and_company << " #{t(:at)} #{user.company}" unless user.company.blank?
+    title_and_company = user_summary_title_and_company(user)
     summary << title_and_company unless title_and_company.blank?
     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))
+    summary << user_summary_created_at(user)
+    summary << user_summary_status(user)
+    summary.join(', ')
+  end
+
+  private
+
+  # Formatted user title and company for user summary
+  def user_summary_title_and_company(user)
+    str = user.title.blank? ? '' : h(user.title)
+    str += " #{t(:at)} #{user.company}" unless user.company.blank?
+    str
+  end
+
+  # Formatted user join date for user summary
+  def user_summary_created_at(user)
+    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))
     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)
+  end
+
+  # Formatted user status for user summary
+  def user_summary_status(user)
+    if user.awaits_approval?
+      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

@@ -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.
@@ -23,12 +25,11 @@ module ApplicationHelper
   # Show existing flash or embed hidden paragraph ready for flash[:notice]
   #----------------------------------------------------------------------------
   def show_flash(options = { sticky: false })
-    %i[error warning info notice].each do |type|
-      if flash[type]
-        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")
-      end
+    %i[error warning info notice alert].each do |type|
+      next unless flash[type]
+      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")
     end
     content_tag(:p, nil, id: "flash", style: "display:none;")
   end
@@ -39,8 +40,7 @@ module ApplicationHelper
                 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")
+                        onclick: "crm.flip_subtitle(this)"), class: "subtitle")
   end
 
   #----------------------------------------------------------------------------
@@ -77,7 +77,7 @@ module ApplicationHelper
   def rating_select(name, options = {})
     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
+    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
 
@@ -91,8 +91,7 @@ module ApplicationHelper
             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]
-    )
+            class: options[:class])
   end
 
   #----------------------------------------------------------------------------
@@ -108,8 +107,7 @@ module ApplicationHelper
     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
-    )
+            onclick: "this.href = this.href.split('?')[0] + '?previous='+encodeURI(crm.find_form('edit_#{j name}'));".html_safe)
   end
 
   #----------------------------------------------------------------------------
@@ -121,8 +119,7 @@ module ApplicationHelper
             options[:url] || url_for(record),
             method: :delete,
             remote: true,
-            confirm: confirm
-    )
+            confirm: confirm)
   end
 
   #----------------------------------------------------------------------------
@@ -133,8 +130,7 @@ module ApplicationHelper
     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
-    )
+            remote:  true)
   end
 
   #----------------------------------------------------------------------------
@@ -142,8 +138,7 @@ module ApplicationHelper
     url = params[:url] if params[:url]
     link_to(t(:cancel),
             url + "#{url.include?('?') ? '&' : '?'}cancel=true",
-            remote: true
-    )
+            remote: true)
   end
 
   #----------------------------------------------------------------------------
@@ -151,19 +146,19 @@ module ApplicationHelper
     link_to("x", url + "#{url.include?('?') ? '&' : '?'}cancel=true",
             remote: true,
             class: "close",
-            title: t(:close_form)
-    )
+            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)
-    if Setting.email_dropbox && Setting.email_dropbox[:address].present?
-      mailto = "#{email}?bcc=#{Setting.email_dropbox[:address]}"
-    else
-      mailto = email
-    end
+    bcc = Setting&.email_dropbox
+    mailto = if bcc && bcc[:address].present?
+               "#{email}?bcc=#{bcc[:address]}"
+             else
+               email
+             end
     if block_given?
       link_to("mailto:#{mailto}", title: email) do
         yield
@@ -225,7 +220,7 @@ module ApplicationHelper
     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}');"
+    text += "$('#menu').html('#{question} #{yes} : #{no}');"
     text.html_safe
   end
 
@@ -244,8 +239,8 @@ 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 << "$('##{j shake.to_s}').effect('shake', { duration:200, distance: 3 });" if shake
+    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
 
@@ -254,14 +249,14 @@ module ApplicationHelper
   def web_presence_icons(person)
     %i[blog linkedin facebook twitter skype].map do |site|
       url = person.send(site)
-      unless url.blank?
-        if site == :skype
-          url = "callto:" << url
-        else
-          url = "http://" << url unless url =~ /^https?:\/\//
-        end
-        link_to(image_tag("#{site}.gif", size: "15x15"), h(url), "data-popup": true, title: t(:open_in_window, h(url)))
+      next if url.blank?
+
+      if site == :skype
+        url = "callto:" + url
+      else
+        url = "http://" + url unless url =~ /^https?:\/\//
       end
+      link_to(image_tag("#{site}.gif", size: "15x15"), h(url), "data-popup": true, title: t(:open_in_window, h(url)))
     end.compact.join("\n").html_safe
   end
 
@@ -273,10 +268,10 @@ module ApplicationHelper
       value = value.last
     end
     %{
-      if ($('##{option}').html() != '#{value}') {
-        $('##{option}').html('#{value}');
+      if ($('##{option}').html() != '#{j value}') {
+        $('##{option}').html('#{j value}');
         $('#loading').show();
-        $.post('#{url}', {#{option}: '#{param || value}'}, function () {
+        $.post('#{url}', {#{option}: '#{j(param || value)}'}, function () {
           $('#loading').hide();
         });
       }
@@ -286,10 +281,10 @@ 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() {" +
+    "{ name: \"#{j name.titleize}\", on_select: function() {" +
       %{
-        if ($('##{option}').html() != '#{name}') {
-          $('##{option}').html('#{name}');
+        if ($('##{option}').html() != '#{j name}') {
+          $('##{option}').html('#{j name}');
           $('#loading').show();
           $.get('#{url}', {#{option}: '#{key}', query: $('#query').val()}, function () {
             $('#loading').hide();
@@ -337,13 +332,11 @@ module ApplicationHelper
     if object.send(attribute).blank?
       form.text_field(attribute,
                       style:   "margin-top: 6px; #{extra_styles}",
-                      placeholder: hint
-      )
+                      placeholder: hint)
     else
       form.text_field(attribute,
                       style:   "margin-top: 6px; #{extra_styles}",
-                      placeholder: hint
-      )
+                      placeholder: hint)
     end
   end
 
@@ -443,35 +436,24 @@ module ApplicationHelper
       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)"
-      )
+                        onclick: "crm.flip_subtitle(this)")
       content << content_tag("small", info_text.to_s, class: "subtitle_inline_info", id: "#{id}_intro", style: hidden ? "" : "display:none;")
     end
   end
 
-  #----------------------------------------------------------------------------
-  # Return name of current view
-  def current_view_name
-    controller = params['controller']
-    action = params['action'] == 'show' ? 'show' : 'index' # create update redraw filter index actions all use index view
-    current_user.pref[:"#{controller}_#{action}_view"]
-  end
-
   #----------------------------------------------------------------------------
   # Get template in current context with current view name
   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.controller_name,
+                                                      action: show_or_index_action,
+                                                      name: current_view_name)
   end
 
   #----------------------------------------------------------------------------
   # Generate buttons for available views given the current context
   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.controller_name,
+                                              action: show_or_index_action)
     return nil unless views.size > 1
     lis = ''.html_safe
     content_tag :ul, class: 'format-buttons' do
@@ -482,8 +464,8 @@ module ApplicationHelper
                     "#{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
+          url = show_or_index_action == "index" ? send("redraw_#{controller.controller_name}_path") : send("#{controller.controller_name.singularize}_path")
+          link_to('#', title: t(view.name, default: h(view.title)), "data-view": h(view.name), "data-url": h(url), "data-context": show_or_index_action, class: classes) do
             icon = view.icon || 'fa-bars'
             content_tag(:i, nil, class: "fa #{h icon}")
           end
@@ -497,8 +479,10 @@ module ApplicationHelper
   # Generate the html for $.timeago function
   # <span class="timeago" datetime="2008-07-17T09:24:17Z">July 17, 2008</span>
   def timeago(time, options = {})
+    return unless time
     options[:class] ||= "timeago"
-    content_tag(:span, h(time.to_s), options.merge(title: time.getutc.iso8601)) if time
+    options[:title] = time.getutc.iso8601
+    content_tag(:span, I18n.l(time), options)
   end
 
   #----------------------------------------------------------------------------
@@ -517,12 +501,22 @@ module ApplicationHelper
 
   #----------------------------------------------------------------------------
   # Ajaxification FTW!
-  # e.g. collection = Opportunity.my.scope
+  # e.g. collection = Opportunity.my(current_user).scope
   #         options = { renderer: {...} , params: {...}
   def paginate(options = {})
     collection = options.delete(:collection)
-    options = { params: { action: 'index' } }.merge(options) if params['action'] == 'filter'
+    options = { params: { action: 'index' } }.merge(options) if controller.action_name == 'filter'
     options = { renderer: RemoteLinkPaginationHelper::LinkRenderer }.merge(options)
     will_paginate(collection, options)
   end
+
+  private
+
+  def show_or_index_action
+    controller.action_name == 'show' ? 'show' : 'index'
+  end
+
+  def current_view_name
+    current_user.pref[:"#{controller.controller_name}_#{show_or_index_action}_view"]
+  end
 end