fat_free_crm 0.15.0.beta.2 → 0.15.0

data/README.md

@@ -1,7 +1,9 @@
-# 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)
+# Fat Free CRM [![TravisCI][travis-img-url]][travis-ci-url]  [![Code Climate][codeclimate-img-url]][codeclimate-url]
 
-[travis-img-url]: https://secure.travis-ci.org/fatfreecrm/fat_free_crm.png?branch=master
+[travis-img-url]: https://secure.travis-ci.org/fatfreecrm/fat_free_crm.svg?branch=master
 [travis-ci-url]: https://travis-ci.org/fatfreecrm/fat_free_crm
+[codeclimate-img-url]: https://codeclimate.com/github/fatfreecrm/fat_free_crm.svg
+[codeclimate-url]: https://codeclimate.com/github/fatfreecrm/fat_free_crm
 
 ### An open source, Ruby on Rails [customer relationship management][crm-wiki] platform (CRM).
 

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

@@ -1,3 +1,8 @@
+# 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
+#------------------------------------------------------------------------------
 (($) ->
   window.crm ||= {}
 

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

@@ -1,3 +1,8 @@
+# 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
+#------------------------------------------------------------------------------
 (($) ->
 
   # Run function on page load

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

@@ -1,3 +1,8 @@
+// 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
+//------------------------------------------------------------------------------
 #about > ul {
   margin-left: 15px;
 }

data/app/assets/stylesheets/common.scss

@@ -704,7 +704,8 @@ ul.tools {
 
 .mail.highlight,
 .comment.highlight {
-  background-color: #f2f2f2; }
+  background-color: #f2f2f2;
+  word-break: break-all; }
 
 .highlight:hover {
   background-color: seashell;

data/app/controllers/admin/fields_controller.rb

@@ -6,7 +6,7 @@
 class Admin::FieldsController < Admin::ApplicationController
   before_action "set_current_tab('admin/fields')", only: [:index]
 
-  load_resource except: [:create, :subform]
+  load_resource except: %i[create subform]
 
   # GET /fields
   # GET /fields.xml                                                      HTML

data/app/controllers/admin/groups_controller.rb

@@ -4,7 +4,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class Admin::GroupsController < Admin::ApplicationController
-  before_action "set_current_tab('admin/groups')", only: [:index, :show]
+  before_action :setup_current_tab, only: %i[index show]
 
   load_resource
 
@@ -62,4 +62,8 @@ class Admin::GroupsController < Admin::ApplicationController
   def group_params
     params[:group].permit!
   end
+
+  def setup_current_tab
+    set_current_tab('admin/groups')
+  end
 end

data/app/controllers/admin/tags_controller.rb

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

data/app/controllers/admin/users_controller.rb

@@ -4,7 +4,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class Admin::UsersController < Admin::ApplicationController
-  before_action "set_current_tab('admin/users')", only: [:index, :show]
+  before_action :setup_current_tab, only: %i[index show]
 
   load_resource except: [:create]
 
@@ -44,8 +44,6 @@ class Admin::UsersController < Admin::ApplicationController
   # POST /admin/users.xml                                                  AJAX
   #----------------------------------------------------------------------------
   def create
-    params[:user][:email].try(:strip!)
-    params[:user][:password_confirmation] = nil if params[:user][:password_confirmation].blank?
     @user = User.new(user_params)
     @user.check_if_needs_approval
     @user.save_without_session_maintenance
@@ -57,8 +55,6 @@ class Admin::UsersController < Admin::ApplicationController
   # PUT /admin/users/1.xml                                                 AJAX
   #----------------------------------------------------------------------------
   def update
-    params[:user][:email].try(:strip!)
-    params[:user][:password_confirmation] = nil if params[:user][:password_confirmation].blank?
     @user = User.find(params[:id])
     @user.attributes = user_params
     @user.save_without_session_maintenance
@@ -108,6 +104,10 @@ class Admin::UsersController < Admin::ApplicationController
   protected
 
   def user_params
+    return {} unless params[:user]
+    params[:user][:email].try(:strip!)
+    params[:user][:password_confirmation] = nil if params[:user][:password_confirmation].blank?
+
     params[:user].permit(
       :admin,
       :username,
@@ -136,7 +136,7 @@ class Admin::UsersController < Admin::ApplicationController
     self.current_page  = options[:page] if options[:page]
     self.current_query = params[:query] if params[:query]
 
-    @search = klass.search(params[:q])
+    @search = klass.ransack(params[:q])
     @search.build_grouping unless @search.groupings.any?
 
     wants = request.format
@@ -146,4 +146,8 @@ class Admin::UsersController < Admin::ApplicationController
     scope = scope.paginate(page: current_page) if wants.html? || wants.js? || wants.xml?
     scope
   end
+
+  def setup_current_tab
+    set_current_tab('admin/users')
+  end
 end

data/app/controllers/application_controller.rb

@@ -6,20 +6,20 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
-  before_filter :set_paper_trail_whodunnit
+  before_action :set_paper_trail_whodunnit
 
   before_action :set_context
   before_action :clear_setting_cache
   before_action :cors_preflight_check
-  before_action "hook(:app_before_filter, self)"
-  after_action "hook(:app_after_filter,  self)"
+  before_action { hook(:app_before_filter, self) }
+  after_action { hook(:app_after_filter,  self) }
   after_action :cors_set_access_control_headers
 
   helper_method :current_user_session, :current_user, :can_signup?
   helper_method :called_from_index_page?, :called_from_landing_page?
   helper_method :klass
 
-  respond_to :html, only: [:index, :show, :auto_complete]
+  respond_to :html, only: %i[index show auto_complete]
   respond_to :js
   respond_to :json, :xml, except: :edit
   respond_to :atom, :csv, :rss, :xls, only: :index
@@ -36,7 +36,7 @@ class ApplicationController < ActionController::Base
     @auto_complete = hook(:auto_complete, self, query: @query, user: current_user)
     if @auto_complete.empty?
       exclude_ids = auto_complete_ids_to_exclude(params[:related])
-      @auto_complete = klass.my.text_search(@query).search(id_not_in: exclude_ids).result.limit(10)
+      @auto_complete = klass.my.text_search(@query).ransack(id_not_in: exclude_ids).result.limit(10)
     else
       @auto_complete = @auto_complete.last
     end
@@ -135,7 +135,7 @@ class ApplicationController < ActionController::Base
       flash[:notice] = t(:msg_login_needed) if request.fullpath != "/"
       respond_to do |format|
         format.html { redirect_to login_url }
-        format.js   { render text: "window.location = '#{login_url}';" }
+        format.js   { render plain: "window.location = '#{login_url}';" }
       end
     end
   end
@@ -217,8 +217,8 @@ class ApplicationController < ActionController::Base
 
     respond_to do |format|
       format.html { redirect_to(redirection_url) }
-      format.js   { render text: 'window.location.reload();' }
-      format.json { render text: flash[:warning],  status: :not_found }
+      format.js   { render plain: 'window.location.reload();' }
+      format.json { render plain: flash[:warning],  status: :not_found }
       format.xml  { render xml: [flash[:warning]], status: :not_found }
     end
   end
@@ -231,8 +231,8 @@ class ApplicationController < ActionController::Base
     url = send("#{related.pluralize}_path")
     respond_to do |format|
       format.html { redirect_to(url) }
-      format.js   { render text: %(window.location.href = "#{url}";) }
-      format.json { render text: flash[:warning],  status: :not_found }
+      format.js   { render plain: %(window.location.href = "#{url}";) }
+      format.json { render plain: flash[:warning],  status: :not_found }
       format.xml  { render xml: [flash[:warning]], status: :not_found }
     end
   end
@@ -242,8 +242,8 @@ class ApplicationController < ActionController::Base
     flash[:warning] = t(:msg_not_authorized, default: 'You are not authorized to take this action.')
     respond_to do |format|
       format.html { redirect_to(redirection_url) }
-      format.js   { render text: 'window.location.reload();' }
-      format.json { render text: flash[:warning],  status: :unauthorized }
+      format.js   { render plain: 'window.location.reload();' }
+      format.json { render plain: flash[:warning],  status: :unauthorized }
       format.xml  { render xml: [flash[:warning]], status: :unauthorized }
     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 plain: ''
     end
   end
 end

data/app/controllers/authentications_controller.rb

@@ -4,7 +4,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class AuthenticationsController < ApplicationController
-  before_action :require_no_user, only: [:new, :create, :show]
+  before_action :require_no_user, only: %i[new create show]
   before_action :require_user, only: :destroy
 
   #----------------------------------------------------------------------------
@@ -19,7 +19,7 @@ class AuthenticationsController < ApplicationController
 
   #----------------------------------------------------------------------------
   def create
-    @authentication = Authentication.new(params[:authentication])
+    @authentication = Authentication.new(params[:authentication].permit(:username, :password, :remember_me))
 
     if @authentication.save && !@authentication.user.suspended?
       flash[:notice] = t(:msg_welcome)

data/app/controllers/comments_controller.rb

@@ -24,8 +24,8 @@ class CommentsController < ApplicationController
     flash[:warning] = t(:msg_assets_not_available, "notes")
     respond_to do |format|
       format.html { redirect_to root_url }
-      format.json { render text: flash[:warning], status: :not_found }
-      format.xml  { render text: flash[:warning], status: :not_found }
+      format.json { render plain: flash[:warning], status: :not_found }
+      format.xml  { render plain: flash[:warning], status: :not_found }
     end
   end
 
@@ -83,6 +83,7 @@ class CommentsController < ApplicationController
   protected
 
   def comment_params
+    return {} unless params[:comment]
     params[:comment].permit!
   end
 

data/app/controllers/entities/contacts_controller.rb

@@ -4,7 +4,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class ContactsController < EntitiesController
-  before_action :get_accounts, only: [:new, :create, :edit, :update]
+  before_action :get_accounts, only: %i[new create edit update]
 
   # GET /contacts
   #----------------------------------------------------------------------------
@@ -65,14 +65,16 @@ class ContactsController < EntitiesController
         @contact.add_comment_by_user(@comment_body, current_user)
         @contacts = get_contacts if called_from_index_page?
       else
-        if params[:account][:id].blank?
-          if request.referer =~ /\/accounts\/(\d+)\z/
-            @account = Account.find(Regexp.last_match[1]) # related account
+        if params[:account]
+          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.new(user: current_user)
+            @account = Account.find(params[:account][:id])
           end
-        else
-          @account = Account.find(params[:account][:id])
         end
         @opportunity = Opportunity.my.find(params[:opportunity]) unless params[:opportunity].blank?
       end

data/app/controllers/entities/opportunities_controller.rb

@@ -6,7 +6,7 @@
 class OpportunitiesController < EntitiesController
   before_action :load_settings
   before_action :get_data_for_sidebar, only: :index
-  before_action :set_params, only: [:index, :redraw, :filter]
+  before_action :set_params, only: %i[index redraw filter]
 
   # GET /opportunities
   #----------------------------------------------------------------------------

data/app/controllers/entities_controller.rb

@@ -5,8 +5,8 @@
 #------------------------------------------------------------------------------
 class EntitiesController < ApplicationController
   before_action :require_user
-  before_action :set_current_tab, only: [:index, :show]
-  before_action :set_view, only: [:index, :show, :redraw]
+  before_action :set_current_tab, only: %i[index show]
+  before_action :set_view, only: %i[index show redraw]
 
   before_action :set_options, only: :index
   before_action :load_ransack_search, only: :index
@@ -87,7 +87,7 @@ class EntitiesController < ApplicationController
         render('fields/group') && return
       end
     end
-    render text: ''
+    render plain: ''
   end
 
   protected
@@ -121,7 +121,7 @@ class EntitiesController < ApplicationController
   end
 
   def resource_params
-    params[controller_name.singularize].permit!
+    params[controller_name.singularize].permit! if params[controller_name.singularize].present?
   end
 
   private

data/app/controllers/home_controller.rb

@@ -4,7 +4,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class HomeController < ApplicationController
-  before_action :require_user, except: [:toggle, :timezone]
+  before_action :require_user, except: %i[toggle timezone]
   before_action :set_current_tab, only: :index
 
   #----------------------------------------------------------------------------
@@ -50,16 +50,16 @@ class HomeController < ApplicationController
     else
       session[params[:id].to_sym] = true
     end
-    render nothing: true
+    head :ok
   end
 
   # GET /home/timeline                                                     AJAX
   #----------------------------------------------------------------------------
   def timeline
     state = params[:state].to_s
-    if %w(Collapsed Expanded).include?(state)
+    if %w[Collapsed Expanded].include?(state)
       if (model_type = params[:type].to_s).present?
-        if %w(comment email).include?(model_type)
+        if %w[comment email].include?(model_type)
           model = model_type.camelize.constantize
           item = model.find(params[:id])
           item.update_attribute(:state, state)
@@ -71,7 +71,7 @@ class HomeController < ApplicationController
       end
     end
 
-    render nothing: true
+    head :ok
   end
 
   # GET /home/timezone                                                     AJAX
@@ -85,7 +85,7 @@ class HomeController < ApplicationController
       session[:timezone_offset] = params[:offset].to_i * -60
       ActiveSupport::TimeZone[session[:timezone_offset]]
     end
-    render nothing: true
+    head :ok
   end
 
   private
@@ -115,7 +115,7 @@ class HomeController < ApplicationController
   def activity_event
     event = current_user.pref[:activity_event]
     if event == "all_events"
-      %w(create update destroy)
+      %w[create update destroy]
     else
       event
     end
@@ -155,8 +155,8 @@ class HomeController < ApplicationController
     duration = current_user.pref[:activity_duration]
     if duration
       words = duration.split("_") # "two_weeks" => 2.weeks
-      if %w(one two).include?(words.first) && %w(hour day days week weeks month).include?(words.last)
-        %w(zero one two).index(words.first).send(words.last)
+      if %w[one two].include?(words.first) && %w[hour day days week weeks month].include?(words.last)
+        %w[zero one two].index(words.first).send(words.last)
       end
     end
   end

data/app/controllers/passwords_controller.rb

@@ -4,7 +4,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class PasswordsController < ApplicationController
-  before_action :load_user_using_perishable_token, only: [:edit, :update]
+  before_action :load_user_using_perishable_token, only: %i[edit update]
   before_action :require_no_user
 
   #----------------------------------------------------------------------------

data/app/controllers/tasks_controller.rb

@@ -5,7 +5,7 @@
 #------------------------------------------------------------------------------
 class TasksController < ApplicationController
   before_action :require_user
-  before_action :set_current_tab, only: [:index, :show]
+  before_action :set_current_tab, only: %i[index show]
   before_action :update_sidebar, only: :index
 
   # GET /tasks
@@ -170,6 +170,7 @@ class TasksController < ApplicationController
   protected
 
   def task_params
+    return {} unless params[:task]
     params[:task].permit!
   end
 

data/app/controllers/users_controller.rb

@@ -4,12 +4,12 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class UsersController < ApplicationController
-  before_action :set_current_tab, only: [:show, :opportunities_overview] # Don't hightlight any tabs.
+  before_action :set_current_tab, only: %i[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: %i[show new]
 
   # GET /users/1
   # GET /users/1.js
@@ -134,6 +134,7 @@ class UsersController < ApplicationController
   protected
 
   def user_params
+    return {} unless params[:user]
     params[:user][:email].try(:strip!)
     params[:user].permit(
       :username,
@@ -153,6 +154,7 @@ class UsersController < ApplicationController
   end
 
   def avatar_params
+    return {} unless params[:avatar]
     params[:avatar]
       .permit(:image)
       .merge(entity: @user)