fat_free_crm 0.15.0.beta → 0.15.0.beta.2

data/README.md

@@ -1,7 +1,7 @@
 # Fat Free CRM [![TravisCI][travis-img-url]][travis-ci-url]  [![Code Climate](https://codeclimate.com/github/fatfreecrm/fat_free_crm.png)](https://codeclimate.com/github/fatfreecrm/fat_free_crm)
 
-[travis-img-url]: https://secure.travis-ci.org/fat_free_crm/fat_free_crm.png?branch=master
-[travis-ci-url]: https://travis-ci.org/fat_free_crm/fat_free_crm
+[travis-img-url]: https://secure.travis-ci.org/fatfreecrm/fat_free_crm.png?branch=master
+[travis-ci-url]: https://travis-ci.org/fatfreecrm/fat_free_crm
 
 ### An open source, Ruby on Rails [customer relationship management][crm-wiki] platform (CRM).
 
@@ -48,13 +48,6 @@ Pull requests and bug reports are always welcome!
 
 Visit our website at http://www.fatfreecrm.com/
 
-## Usage
-To use this; simply add to your Gemfile
-```
-gem 'fat_free_crm'
-```
-
-
 
 ## System Requirements
 

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

@@ -8,7 +8,7 @@
 //= require jquery-migrate
 //= require jquery_ujs
 //= require jquery-ui
-//= require select2
+//= require select2-full
 //= require crm
 //= require crm_classes
 //= require crm_loginout

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

@@ -18,7 +18,6 @@
     #$(".select2_tag").each ->
       $(this).select2
         'width':'resolve'
-        tags: $(this).data("tags")
         placeholder: $(this).data("placeholder")
         multiple: $(this).data("multiple")
 

data/app/controllers/application_controller.rb

@@ -45,7 +45,7 @@ class ApplicationController < ActionController::Base
     respond_to do |format|
       format.any(:js, :html)   { render partial: 'auto_complete' }
       format.json do
-        render json: @auto_complete.inject({}){|h, a|
+        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
                      }
       end
@@ -251,10 +251,10 @@ class ApplicationController < ActionController::Base
   #----------------------------------------------------------------------------
   def redirection_url
     # Try to redirect somewhere sensible. Note: not all controllers have an index action
-    url = if current_user.present?
-            (respond_to?(:index) && action_name != 'index') ? { action: 'index' } : root_url
-          else
-            login_url
+    if current_user.present?
+      respond_to?(:index) && action_name != 'index' ? { action: 'index' } : root_url
+    else
+      login_url
     end
   end
 
@@ -272,7 +272,7 @@ class ApplicationController < ActionController::Base
       headers['Access-Control-Allow-Headers'] = 'X-Requested-With, X-Prototype-Version, Token'
       headers['Access-Control-Max-Age'] = '1728000'
 
-      render :text => '', :content_type => 'text/plain'
+      render text: '', content_type: 'text/plain'
     end
   end
 end

data/app/controllers/comments_controller.rb

@@ -34,7 +34,8 @@ class CommentsController < ApplicationController
   def edit
     @comment = Comment.find(params[:id])
 
-    model, id = @comment.commentable_type, @comment.commentable_id
+    model = @comment.commentable_type
+    id = @comment.commentable_id
     unless model.constantize.my.find_by_id(id)
       respond_to_related_not_found(model.downcase)
     end
@@ -49,12 +50,13 @@ class CommentsController < ApplicationController
       comment_params.merge(user_id: current_user.id)
     )
     # Make sure commentable object exists and is accessible to the current user.
-    model, id = @comment.commentable_type, @comment.commentable_id
-    unless model.constantize.my.find_by_id(id)
-      respond_to_related_not_found(model.downcase)
-    else
+    model = @comment.commentable_type
+    id = @comment.commentable_id
+    if model.constantize.my.find_by_id(id)
       @comment.save
       respond_with(@comment)
+    else
+      respond_to_related_not_found(model.downcase)
     end
   end
 

data/app/controllers/entities/contacts_controller.rb

@@ -65,14 +65,14 @@ class ContactsController < EntitiesController
         @contact.add_comment_by_user(@comment_body, current_user)
         @contacts = get_contacts if called_from_index_page?
       else
-        unless params[:account][:id].blank?
-          @account = Account.find(params[:account][:id])
-        else
+        if params[:account][:id].blank?
           if request.referer =~ /\/accounts\/(\d+)\z/
             @account = Account.find(Regexp.last_match[1]) # related account
           else
             @account = Account.new(user: current_user)
           end
+        else
+          @account = Account.find(params[:account][:id])
         end
         @opportunity = Opportunity.my.find(params[:opportunity]) unless params[:opportunity].blank?
       end
@@ -153,7 +153,7 @@ class ContactsController < EntitiesController
 
   def set_options
     super
-    @naming = (current_user.pref[:contacts_naming]   || Contact.first_name_position) unless params[:cancel].true?
+    @naming = (current_user.pref[:contacts_naming] || Contact.first_name_position) unless params[:cancel].true?
   end
 
   #----------------------------------------------------------------------------

data/app/controllers/entities/opportunities_controller.rb

@@ -79,14 +79,14 @@ class OpportunitiesController < EntitiesController
         end
       else
         @accounts = Account.my.order('name')
-        unless params[:account][:id].blank?
-          @account = Account.find(params[:account][:id])
-        else
+        if params[:account][:id].blank?
           if request.referer =~ /\/accounts\/(\d+)\z/
             @account = Account.find(Regexp.last_match[1]) # related account
           else
             @account = Account.new(user: current_user)
           end
+        else
+          @account = Account.find(params[:account][:id])
         end
         @contact = Contact.find(params[:contact]) unless params[:contact].blank?
         @campaign = Campaign.find(params[:campaign]) unless params[:campaign].blank?

data/app/controllers/entities_controller.rb

@@ -186,7 +186,8 @@ class EntitiesController < ApplicationController
   #----------------------------------------------------------------------------
   def parse_query_and_tags(search_string)
     return ['', ''] if search_string.blank?
-    query, tags = [], []
+    query = []
+    tags = []
     search_string.strip.split(/\s+/).each do |token|
       if token.starts_with?("#")
         tags << token[1..-1]
@@ -207,7 +208,7 @@ class EntitiesController < ApplicationController
   def set_view
     if params['view']
       controller = params['controller']
-      action = (params['action'] == 'show') ? 'show' : 'index' # create update redraw filter index actions all use index view
+      action = params['action'] == 'show' ? 'show' : 'index' # create update redraw filter index actions all use index view
       current_user.pref[:"#{controller}_#{action}_view"] = params['view']
     end
   end

data/app/controllers/home_controller.rb

@@ -126,23 +126,30 @@ class HomeController < ApplicationController
   # needs refactoring to use user id instead. Permuations based on name or email
   # yield incorrect results.
   def activity_user
-    user = current_user.pref[:activity_user]
-    if user && user != "all_users"
-      user = if user =~ /@/ # email
-               User.where(email: user).first
-             else # first_name middle_name last_name any_name
-               name_query = if user.include?(" ")
-                              user.name_permutations.map do |first, last|
-                                User.where(first_name: first, last_name: last)
-                              end.map(&:to_a).flatten.first
-                            else
-                              [User.where(first_name: user), User.where(last_name: user)].map(&:to_a).flatten.first
-               end
-        end
-    end
+    return nil if current_user.pref[:activity_user] == "all_users"
+    return nil unless current_user.pref[:activity_user]
+
+    is_email = current_user.pref[:activity_user].include?("@")
+
+    user = if is_email
+             User.where(email: current_user.pref[:activity_user]).first
+           else # first_name middle_name last_name any_name
+             name_query(current_user.pref[:activity_user])
+           end
+
     user.is_a?(User) ? user.id : nil
   end
 
+  def name_query(user)
+    if user.include?(" ")
+      user.name_permutations.map do |first, last|
+        User.where(first_name: first, last_name: last)
+      end.map(&:to_a).flatten.first
+    else
+      [User.where(first_name: user), User.where(last_name: user)].map(&:to_a).flatten.first
+    end
+  end
+
   #----------------------------------------------------------------------------
   def activity_duration
     duration = current_user.pref[:activity_duration]

data/app/controllers/passwords_controller.rb

@@ -60,6 +60,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/users_controller.rb

@@ -102,13 +102,13 @@ class UsersController < ApplicationController
   #----------------------------------------------------------------------------
   def change_password
     if @user.valid_password?(params[:current_password], true) || @user.password_hash.blank?
-      unless params[:user][:password].blank?
+      if params[:user][:password].blank?
+        flash[:notice] = t(:msg_password_not_changed)
+      else
         @user.password = params[:user][:password]
         @user.password_confirmation = params[:user][:password_confirmation]
         @user.save
         flash[:notice] = t(:msg_password_changed)
-      else
-        flash[:notice] = t(:msg_password_not_changed)
       end
     else
       @user.errors.add(:current_password, t(:msg_invalid_password))

data/app/helpers/accounts_helper.rb

@@ -28,8 +28,8 @@ module AccountsHelper
     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'),
+                      "data-placeholder": t(:select_an_account),
+                      "data-url": auto_complete_accounts_path(format: 'json'),
                       style: "width:330px; display:none;",
                       class: 'ajax_chosen'
   end

data/app/helpers/application_helper.rb

@@ -10,14 +10,14 @@ module ApplicationHelper
       @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
-      fail FatFreeCRM::MissingSettings, "Tab settings are missing, please run <b>rake ffcrm:setup</b> command."
+      raise 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]
@@ -36,7 +36,7 @@ module ApplicationHelper
   #----------------------------------------------------------------------------
   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,
+                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)"
@@ -244,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
@@ -258,9 +258,9 @@ module ApplicationHelper
         if site == :skype
           url = "callto:" << url
         else
-          url = "http://" << url unless url.match(/^https?:\/\//)
+          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)))
+        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
@@ -269,7 +269,8 @@ module ApplicationHelper
   #----------------------------------------------------------------------------
   def redraw(option, value, url = send("redraw_#{controller.controller_name}_path"))
     if value.is_a?(Array)
-      param, value = value.first, value.last
+      param = value.first
+      value = value.last
     end
     %{
       if ($('##{option}').html() != '#{value}') {
@@ -361,11 +362,11 @@ module ApplicationHelper
   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[:id] = params[:id] unless params[:id].blank?
+    url_params[:query] = params[:query] unless params[:query].blank?
+    url_params[:q] = params[:q] unless params[:q].blank?
+    url_params[:view] = @view unless @view.blank? # tasks
+    url_params[: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"
@@ -439,7 +440,7 @@ module ApplicationHelper
   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,
+      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)"
@@ -452,7 +453,7 @@ module ApplicationHelper
   # 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
+    action = params['action'] == 'show' ? 'show' : 'index' # create update redraw filter index actions all use index view
     current_user.pref[:"#{controller}_#{action}_view"]
   end
 
@@ -460,7 +461,7 @@ module ApplicationHelper
   # 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
+    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
   end
@@ -469,7 +470,7 @@ module ApplicationHelper
   # 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
+    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)
     return nil unless views.size > 1
     lis = ''.html_safe
@@ -481,8 +482,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 = 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
             icon = view.icon || 'fa-bars'
             content_tag(:i, nil, class: "fa #{h icon}")
           end
@@ -520,7 +521,7 @@ module ApplicationHelper
   #         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 params['action'] == 'filter'
     options = { renderer: RemoteLinkPaginationHelper::LinkRenderer }.merge(options)
     will_paginate(collection, options)
   end

data/app/helpers/campaigns_helper.rb

@@ -29,6 +29,6 @@ module CampaignsHelper
   def campaign_summary(campaign)
     status  = render file: "campaigns/_status.html.haml",  locals: { campaign: campaign }
     metrics = render file: "campaigns/_metrics.html.haml", locals: { campaign: campaign }
-    "#{t(campaign.status)}, " << [status, metrics].map { |str| strip_tags(str) }.join(' ').gsub("\n", '')
+    "#{t(campaign.status)}, " << [status, metrics].map { |str| strip_tags(str) }.join(' ').delete("\n")
   end
 end

data/app/helpers/opportunities_helper.rb

@@ -13,7 +13,8 @@ module OpportunitiesHelper
   # Opportunity summary for RSS/ATOM feeds.
   #----------------------------------------------------------------------------
   def opportunity_summary(opportunity)
-    summary, amount = [], []
+    summary = []
+    amount = []
     summary << (opportunity.stage ? t(opportunity.stage) : t(:other))
     summary << number_to_currency(opportunity.weighted_amount, precision: 0)
     unless %w(won lost).include?(opportunity.stage)
@@ -38,8 +39,8 @@ module OpportunitiesHelper
     selected_campaign = Campaign.find_by_id(options[:selected])
     campaigns = ([selected_campaign] + Campaign.my.order(:name).limit(25)).compact.uniq
     collection_select :opportunity, :campaign_id, campaigns, :id, :name, options,
-                      :"data-placeholder" => t(:select_a_campaign),
-                      :"data-url" => auto_complete_campaigns_path(format: 'json'),
+                      "data-placeholder": t(:select_a_campaign),
+                      "data-url": auto_complete_campaigns_path(format: 'json'),
                       style: "width:330px; display:none;",
                       class: 'ajax_chosen'
   end

data/app/helpers/tasks_helper.rb

@@ -92,23 +92,25 @@ module TasksHelper
 
   #----------------------------------------------------------------------------
   def replace_content(task, bucket = nil)
-    partial = (task.assigned_to && task.assigned_to != current_user.id) ? "assigned" : "pending"
+    partial = task.assigned_to && task.assigned_to != current_user.id ? "assigned" : "pending"
     html = render(partial: "tasks/#{partial}", collection: [task], locals: { bucket: bucket })
-    text = "$('##{dom_id(task)}').html('#{ j html }');\n".html_safe
+    text = "$('##{dom_id(task)}').html('#{j html}');\n".html_safe
+
+    text
   end
 
   #----------------------------------------------------------------------------
   def insert_content(task, bucket, view)
     text = "$('#list_#{bucket}').show();\n"
     html = render(partial: view, collection: [task], locals: { bucket: bucket })
-    text << "$('##{h bucket.to_s}').prepend('#{ j html }');\n"
+    text << "$('##{h bucket.to_s}').prepend('#{j html}');\n"
     text << "$('##{dom_id(task)}').effect('highlight', { duration:1500 });\n"
     text.html_safe
   end
 
   #----------------------------------------------------------------------------
   def tasks_flash(message)
-    text = "$('#flash').html('#{ sanitize(message) }');\n"
+    text = "$('#flash').html('#{sanitize(message)}');\n"
     text << "crm.flash('notice', true)\n"
     text.html_safe
   end

data/app/helpers/users_helper.rb

@@ -6,7 +6,7 @@
 module UsersHelper
   def language_for(user)
     if user.preference[:locale]
-      locale, language = languages.detect { |locale, _language| locale == user.preference[:locale] }
+      _locale, language = languages.detect { |locale, _language| locale == user.preference[:locale] }
     end
     language || "English"
   end