fat_free_crm 0.18.2 → 0.19.0

data/app/views/contacts/_index_brief.html.haml

@@ -14,7 +14,7 @@
       %li= link_to_delete(contact)
 
   .indentslim
-    = link_to_if can?(:read, contact), contact.full_name(@current_user.preference[:contacts_naming]), contact
+    = link_to_if can?(:read, contact), contact.full_name(current_user.preference[:contacts_naming]), contact
     %tt
       = brief_account_info(contact)
 

data/app/views/contacts/_index_full.html.haml

@@ -14,7 +14,7 @@
       %li= link_to_delete(contact)
 
   .indentslim
-    = link_to_if can?(:read, contact), contact.full_name(@current_user.preference[:contacts_naming]), contact
+    = link_to_if can?(:read, contact), contact.full_name(current_user.preference[:contacts_naming]), contact
     %tt
       - if contact.title? && contact.department?
         == #{contact.title}, #{contact.department}

data/app/views/contacts/_index_long.html.haml

@@ -14,7 +14,7 @@
       %li= link_to_delete(contact)
 
   .indentslim
-    = link_to_if can?(:read, contact), contact.full_name(@current_user.preference[:contacts_naming]), contact
+    = link_to_if can?(:read, contact), contact.full_name(current_user.preference[:contacts_naming]), contact
     %tt
       = brief_account_info(contact)
 

data/app/views/devise/confirmations/new.html.haml

@@ -0,0 +1,9 @@
+.standalone#standalone
+  = simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
+    .title= t('devise.confirmations.new.resend_confirmation_instructions')
+    .section
+      .label= t(:email)
+      = f.input_field :email, required: true, autofocus: true
+    %br
+    .buttonbar
+      = f.button :submit, t('devise.confirmations.new.resend_confirmation_instructions')

data/app/views/devise/mailer/confirmation_instructions.html.haml

@@ -0,0 +1,4 @@
+- require 'devise/version'
+%p= t('.greeting', recipient: @resource.email)
+%p= t('.instruction')
+%p= link_to t('.action'), confirmation_url(@resource, confirmation_token: @token)

data/app/views/devise/mailer/password_change.html.haml

@@ -0,0 +1,3 @@
+- require 'devise/version'
+%p= t('.greeting', recipient: @resource.email)
+%p= t('.message')

data/app/views/devise/mailer/reset_password_instructions.html.haml

@@ -0,0 +1,6 @@
+- require 'devise/version'
+%p= t('.greeting', recipient: @resource.email)
+%p= t('.instruction')
+%p= link_to t('.action'), edit_password_url(@resource, reset_password_token: @token)
+%p= t('.instruction_2')
+%p= t('.instruction_3')

data/app/views/devise/passwords/edit.html.haml

@@ -0,0 +1,18 @@
+.standalone
+  = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
+    .title= t(:reset_password)
+
+    = f.error_messages object_name: t('password')
+
+    .intro= t(:confirm_password_intro)
+
+    = f.input :reset_password_token, as: :hidden, input_html: { value: params[:reset_password_token] }
+
+    .section
+      .label= t(:new_password)
+      = f.input_field :password, required: true, autofocus: true
+      .label= t(:password_confirmation)
+      = f.input_field :password_confirmation, required: true
+    %br
+    .buttonbar
+      = f.submit t(:update_password_and_login)

data/app/views/devise/passwords/new.html.haml

@@ -0,0 +1,10 @@
+.standalone#standalone
+  = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
+    .title= t(:forgot_password)
+    .intro= t(:password_intro)
+    .section
+      .label= t(:email)
+      = f.input_field :email, required: true, autofocus: true
+    %br
+    .buttonbar
+      = f.button :submit, t(:reset_password), id: 'passwords_submit'

data/app/views/devise/registrations/new.html.haml

@@ -0,0 +1,21 @@
+.standalone
+  = simple_form_for(@user, html: one_submit_only) do |f|
+    .title_tools
+      = t(:already_signed_up)
+      = link_to t(:login_now_link), new_session_path(resource_name)
+    .title= t(:sign_up)
+
+    = f.error_messages object_name: t('user')
+
+    .section
+      .label= t(:username)
+      = f.input_field :username, minlength: 1
+      .label= t(:email)
+      = f.input_field :email
+      .label= t(:password)
+      = f.input_field :password
+      .label= t(:password_confirmation)
+      = f.input_field :password_confirmation
+
+    .buttonbar
+      = f.submit t(:sign_up_button)

data/app/views/devise/sessions/new.html.haml

@@ -0,0 +1,32 @@
+= content_for(:javascript_epilogue) do
+  :plain
+    document.observe("dom:loaded", function() {
+      new Effect.Move("standalone", { x:0, y:-16, mode:"relative", fps:100, duration:0.15, afterFinishInternal: function(effect) {
+        new Effect.Move("standalone", { x:0, y:16, mode:"relative", fps:100, duration:0.15, afterFinishInternal: function(effect) {
+          new Effect.Move("standalone", { x:0, y:-8, mode:"relative", fps:100, duration:0.15, afterFinishInternal: function(effect) {
+            new Effect.Move("standalone", { x:0, y:8, mode:"relative", fps:100, duration:0.15 });
+          }});
+        }});
+      }});
+    });
+
+.standalone#standalone
+  = simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+    - if User.can_signup?
+      .title_tools
+        = t(:no_account)
+        = link_to(t(:sign_up_now), new_registration_path(resource_name))
+    .title= t(:login)
+    .section
+      .label= t(:username)
+      = f.input_field :email, as: :string
+      .label= t(:password)
+      = f.input_field :password
+
+    %div(style="margin-left:12px")
+      = f.input :remember_me, as: :boolean, inline_label: t('remember_me')
+    %br
+    .buttonbar
+      = f.submit t(:login)
+      = t(:or)
+      = link_to t(:forgot_password) + '?', new_password_path(resource_name)

data/app/views/layouts/_about.html.haml

@@ -9,9 +9,9 @@
   #{t :about_ffc_resources}:
   %ul
     %li== » #{link_to t(:about_home_page), "http://www.fatfreecrm.com", :"data-popup" => true}
-    %li== » #{link_to t(:about_project_page), "http://github.com/fatfreecrm/fat_free_crm/tree/master", :"data-popup" => true}
-    %li== » #{link_to t(:about_features), "http://github.com/fatfreecrm/fat_free_crm/issues", :"data-popup" => true}
-    %li== » #{link_to t(:about_twitter), "http://twitter.com/fatfreecrm", :"data-popup" => true}
-    %li== » #{link_to t(:about_user_group), "http://groups.google.com/group/fat-free-crm-users", :"data-popup" => true}
-    %li== » #{link_to t(:about_dev_group), "http://groups.google.com/group/fat-free-crm-dev", :"data-popup" => true}
+    %li== » #{link_to t(:about_project_page), "https://github.com/fatfreecrm/fat_free_crm/tree/master", :"data-popup" => true}
+    %li== » #{link_to t(:about_features), "https://github.com/fatfreecrm/fat_free_crm/issues", :"data-popup" => true}
+    %li== » #{link_to t(:about_twitter), "https://twitter.com/fatfreecrm", :"data-popup" => true}
+    %li== » #{link_to t(:about_user_group), "https://groups.google.com/group/fat-free-crm-users", :"data-popup" => true}
+    %li== » #{link_to t(:about_dev_group), "https://groups.google.com/group/fat-free-crm-dev", :"data-popup" => true}
   %br

data/app/views/layouts/_header.html.haml

@@ -10,11 +10,11 @@
       = link_to(t(:profile), profile_path) << " |"
       - if current_user.admin?
         = link_to(t(:admin), admin_path) << " |"
-      = link_to(t(:logout), logout_path, method: :delete)
+      = link_to(t(:logout), destroy_user_session_path, method: :delete)
       = render "/layouts/jumpbox"
     - else
-      = link_to(t(:login), login_path) << " |"
-      = link_to(t(:sign_up), signup_path) << " |" if can_signup?
+      = link_to(t(:login), new_user_session_path) << " |"
+      = link_to(t(:sign_up), new_user_registration_path) << " |" if User.can_signup?
       = link_to(t(:about), "#", title: t(:about_ffc), onclick: "$('#about').dialog({ title: this.title, modal: true }); return false;")
   %h3
     = link_to("Fat Free CRM", root_path)

data/app/views/layouts/admin/_header.html.haml

@@ -8,7 +8,7 @@
     = link_to(t(:quick_find), "#", id: "jumper") << " |"
     = link_to(t(:profile), profile_path) << " |"
     = link_to(t(:back_to_crm), root_path) << " |"
-    = link_to(t(:logout), logout_path, method: :delete)
+    = link_to(t(:logout), destroy_user_session_path, method: :delete)
     = render "/layouts/jumpbox"
   %h3
     = link_to(t(:crm_admin_page), admin_path)

data/app/views/shared/_address.html.haml

@@ -26,19 +26,19 @@
               .label #{t title}:
           - else
             .label #{t title}:
-          = address_field(a, address, :street1, "width:240px; margin-top:3px")
-          = address_field(a, address, :street2, "width:240px;")
+          = address_field(a, :street1, "width:240px; margin-top:3px")
+          = address_field(a, :street2, "width:240px;")
     %table.address(cellpadding="0" cellspacing="0")
       %tr
         %td
-          = address_field(a, address, :city, "width:165px;")
+          = address_field(a, :city, "width:165px;")
         %td= spacer
         %td
-          = address_field(a, address, :state, "width:60px;")
+          = address_field(a, :state, "width:60px;")
     %table.address(cellpadding="0" cellspacing="0")
       %tr
         %td
-          = address_field(a, address, :zipcode, "width:80px;")
+          = address_field(a, :zipcode, "width:80px;")
         %td= spacer
         %td
           = a.country_select(:country, priority_countries, { include_blank: "" }, {:"data-placeholder" => t(:select_a_country), style: "width:150px; margin-top:6px", class: 'select2'})

data/app/views/shared/_paginate_with_per_page.html.haml

@@ -9,4 +9,5 @@
     - if count == @per_page.to_i
       %em.current= count
     - else
+      - q = params[:q] ? params[:q].permit! : nil
       = link_to count, send("redraw_#{controller.controller_name}_path", per_page: count, query: params[:query], q: params[:q]), remote: true

data/app/views/users/_avatar.html.haml

@@ -11,7 +11,7 @@
       %div= a.file_field :image
 
     .buttonbar
-      %small.cool{style: "float:right"}== #{t :gravatar_help} #{link_to(t(:here), "http://en.gravatar.com", :"data-popup" => true)}.
+      %small.cool{style: "float:right"}== #{t :gravatar_help} #{link_to(t(:here), "https://en.gravatar.com", :"data-popup" => true)}.
       = f.submit t(:upload_picture), id: "user_avatar_submit"
       #{t :or}
       = link_to(t(:use_gravatar), upload_avatar_user_path(@user) + '?gravatar=1', method: :put, remote: true)

data/bin/bundle

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')

data/bin/rails

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/bin/setup

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
+  # end
+
+  puts "\n== Preparing database =="
+  system! 'bin/rails db:setup'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/bin/update

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/bin/yarn

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
+  begin
+    exec "yarnpkg", *ARGV
+  rescue Errno::ENOENT
+    warn "Yarn executable was not detected in the system."
+    warn "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end

data/config/application.rb

@@ -5,9 +5,10 @@
 # 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
 #------------------------------------------------------------------------------
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 require 'rubygems'
+require 'rails/all'
 
 # Pick the frameworks you want:
 require "active_record/railtie"
@@ -27,6 +28,9 @@ require 'fat_free_crm/gem_ext/rails/engine'
 
 module FatFreeCRM
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.0
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
@@ -36,12 +40,10 @@ module FatFreeCRM
                              Dir[Rails.root.join("app/controllers/entities")]
 
     # Prevent Field class from being reloaded more than once as this clears registered customfields
-    config.autoload_once_paths += [File.expand_path("../app/models/fields/field.rb", __FILE__)]
+    config.autoload_once_paths += [File.expand_path('app/models/fields/field.rb', __dir__)]
 
     # Activate observers that should always be running.
-    unless ARGV.join.include?('assets:precompile')
-      config.active_record.observers = :lead_observer, :opportunity_observer, :task_observer, :entity_observer
-    end
+    config.active_record.observers = :lead_observer, :opportunity_observer, :task_observer, :entity_observer unless ARGV.join.include?('assets:precompile')
 
     # Load development rake tasks (RSpec, Gem packaging, etc.)
     rake_tasks do
@@ -69,7 +71,7 @@ module FatFreeCRM
     config.encoding = "utf-8"
 
     # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += %i[password password_hash password_salt password_confirmation]
+    config.filter_parameters += %i[password encrypted_password password_salt password_confirmation]
   end
 end
 

data/config/boot.rb

@@ -7,7 +7,7 @@
 #------------------------------------------------------------------------------
 
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 

data/config/brakeman.ignore

@@ -47,13 +47,13 @@
       "file": "app/views/admin/users/_user.html.haml",
       "line": 44,
       "link": "https://brakemanscanner.org/docs/warning_types/cross_site_scripting",
-      "code": "t(:last_logged_in, timeago((Unresolved Model).new.current_login_at))",
+      "code": "t(:last_logged_in, timeago((Unresolved Model).new.current_sign_in_at))",
       "render_path": [{"type":"template","name":"admin/users/index","line":11,"file":"app/views/admin/users/index.html.haml"}],
       "location": {
         "type": "template",
         "template": "admin/users/_user"
       },
-      "user_input": "(Unresolved Model).new.current_login_at",
+      "user_input": "(Unresolved Model).new.current_sign_in_at",
       "confidence": "Weak",
       "note": ""
     },

data/config/database.postgres.docker.yml

@@ -2,10 +2,10 @@
 development: &development
   adapter: postgresql
   database: fat_free_crm_development
-  username: postgres
-  password:
-  host:     db
-  port:     5432
+  username: <%= ENV['DB_USERNAME'] %>
+  password: <%= ENV['DB_PASSWORD'] %>
+  host:     <%= ENV['DB_HOST'] %>
+  port:     <%= ENV['DB_PORT'] %>
   schema_search_path: public
   min_messages: warning
 
@@ -18,7 +18,7 @@ test:
 
 production:
   <<: *development
-  database: fat_free_crm_production
+  database: <%= ENV['DB_DATABASE'] %>
 
 staging:
   <<: *development

data/config/environment.rb

@@ -6,7 +6,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 # Load the rails application
-require File.expand_path('../application', __FILE__)
+require_relative 'application'
 
 # Initialize the rails application
 FatFreeCRM::Application.initialize!