fat_free_crm 0.16.4 → 0.17.1

data/app/models/users/ability.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/models/users/authentication.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/models/users/group.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/models/users/permission.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/models/users/preference.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/models/users/user.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.
@@ -40,8 +42,8 @@
 
 class User < ActiveRecord::Base
   has_one :avatar, as: :entity, dependent: :destroy  # Personal avatar.
-  has_many :avatars                                         # As owner who uploaded it, ex. Contact avatar.
-  has_many :comments, as: :commentable                   # As owner who created a comment.
+  has_many :avatars                                  # As owner who uploaded it, ex. Contact avatar.
+  has_many :comments, as: :commentable               # As owner who created a comment.
   has_many :accounts
   has_many :campaigns
   has_many :leads
@@ -64,7 +66,7 @@ class User < ActiveRecord::Base
     where('upper(username) LIKE upper(:s) OR upper(email) LIKE upper(:s) OR upper(first_name) LIKE upper(:s) OR upper(last_name) LIKE upper(:s)', s: "%#{query}%")
   }
 
-  scope :my, -> { accessible_by(User.current_ability) }
+  scope :my, ->(current_user) { accessible_by(current_user.ability) }
 
   scope :have_assigned_opportunities, -> {
     joins("INNER JOIN opportunities ON users.id = opportunities.assigned_to")
@@ -140,20 +142,22 @@ class User < ActiveRecord::Base
     [name].to_xml
   end
 
-  def destroyable?
-    check_if_current_user && !has_related_assets?
+  # Returns permissions ability object.
+  #----------------------------------------------------------------------------
+  def ability
+    @ability ||= Ability.new(self)
   end
 
-  # Suspend newly created user if signup requires an approval.
+  # Returns true if this user is allowed to be destroyed.
   #----------------------------------------------------------------------------
-  def check_if_needs_approval
-    self.suspended_at = Time.now if Setting.user_signup == :needs_approval && !admin
+  def destroyable?(current_user)
+    current_user != self && !has_related_assets?
   end
 
-  # Prevent current user from deleting herself.
+  # Suspend newly created user if signup requires an approval.
   #----------------------------------------------------------------------------
-  def check_if_current_user
-    User.current_user.nil? || User.current_user != self
+  def suspend_if_needs_approval
+    self.suspended_at = Time.now if Setting.user_signup == :needs_approval && !admin
   end
 
   # Prevent deleting a user unless she has no artifacts left.
@@ -172,10 +176,6 @@ class User < ActiveRecord::Base
   # Define class methods
   #----------------------------------------------------------------------------
   class << self
-    def current_ability
-      Ability.new(User.current_user)
-    end
-
     def can_signup?
       %i[allowed needs_approval].include? Setting.user_signup
     end

data/app/views/accounts/_account.html.haml

@@ -1,5 +1,5 @@
-- if (params['controller'] == 'accounts') and (template = template_for_current_view).present?
-  = render(template, :account => account)
+- if (controller.controller_name == 'accounts') and (template = template_for_current_view).present?
+  = render(template, account: account)
 - else
   -# default view
-  = render 'accounts/index_brief', :account => account
+  = render 'accounts/index_brief', account: account

data/app/views/accounts/_contact_info.html.haml

@@ -7,20 +7,20 @@
   #account_contact{ hidden_if(collapsed) }
     %table
       %tr
-        %td{ :colspan => 3 }
-          %table{ :width => "100%", :cellpadding => 0, :cellspacing => 0 }
+        %td{ colspan: 3 }
+          %table{ width: "100%", cellpadding: 0, cellspacing: 0 }
             %tr
               %td
                 .label #{t :phone_toll_free}:
-                = f.text_field :toll_free_phone, :style => "width:154px"
+                = f.text_field :toll_free_phone, style: "width:154px"
               %td= spacer
               %td
                 .label #{t :phone}:
-                = f.text_field :phone, :style => "width:154px"
+                = f.text_field :phone, style: "width:154px"
               %td= spacer
               %td
                 .label #{t :fax}:
-                = f.text_field :fax, :style => "width:154px"
+                = f.text_field :fax, style: "width:154px"
       %tr
         %td
           .label.top #{t :website}:
@@ -31,7 +31,7 @@
           = f.text_field :email
       %tr
         %td
-          = render "shared/address", :f => f, :asset => @account, :type => :billing, :title => :billing_address
+          = render "shared/address", f: f, asset: @account, type: :billing, title: :billing_address
         %td= spacer
         %td
-          = render "shared/address", :f => f, :asset => @account, :type => :shipping, :title => :shipping_address, :same_as_billing => true
+          = render "shared/address", f: f, asset: @account, type: :shipping, title: :shipping_address, same_as_billing: true

data/app/views/accounts/_edit.html.haml

@@ -1,20 +1,20 @@
 .remote
-  = simple_form_for(@account, :html => one_submit_only, :remote => true) do |f|
+  = simple_form_for(@account, html: one_submit_only, remote: true) do |f|
     = link_to_close edit_account_path(@account)
     = f.hidden_field :user_id
 
-    = f.error_messages :object_name => t('account')
+    = f.error_messages object_name: t('account')
 
-    = render "accounts/top_section",  :f => f, :edit => true
-    = render "fields/edit_custom_field_group", :f => f, :edit => true
-    = render "accounts/contact_info", :f => f, :edit => true
-    = render "fields/groups",         :f => f, :edit => true
-    = render "entities/permissions",  :f => f, :edit => true, :entity => @account
+    = render "accounts/top_section",  f: f, edit: true
+    = render "fields/edit_custom_field_group", f: f, edit: true
+    = render "accounts/contact_info", f: f, edit: true
+    = render "fields/groups",         f: f, edit: true
+    = render "entities/permissions",  f: f, edit: true, entity: @account
     = hook(:entity_form, self, {f: f, entity: @account})
 
     .buttonbar
       - if Setting.compound_address
-        = f.submit t(:save_account), :onclick => "crm.clear_all_hints()"
+        = f.submit t(:save_account), onclick: "crm.clear_all_hints()"
       - else
         = f.submit t(:save_account)
       #{t :or}

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

@@ -1,12 +1,12 @@
-- amount = account.opportunities.pipeline.map(&:weighted_amount).sum
+- amount = account.pipeline_opportunities.map(&:weighted_amount).sum
 %li.highlight[account]
   - if account.category
-    .strip{:class => account.category} #{t(account.category)}
+    .strip{class: account.category} #{t(account.category)}
   - else
-    .strip{:style => "color: gray;"} #{t :other}
+    .strip{style: "color: gray;"} #{t :other}
 
   %ul.tools
-    = hook(:account_tools_before, self, :account => account)
+    = hook(:account_tools_before, self, account: account)
 
     - if can?(:update, account)
       %li= link_to_edit(account)
@@ -17,16 +17,16 @@
   .indent
     = link_to(account.name, account)
     - if amount != 0.0
-      %span.amount= number_to_currency(amount, :precision => 0)
+      %span.amount= number_to_currency(amount, precision: 0)
     –
     %tt
-      = account.location << ", " unless account.location.blank?
+      = account.location + ", " unless account.location.blank?
       - user_name = account.user.try(:full_name)
       - if user_name
-        = t(:added_by, :time_ago => timeago(account.created_at), :user => h(user_name)).html_safe << " | "
+        = t(:added_by, time_ago: timeago(account.created_at), user: h(user_name)).html_safe << " | "
       - else
-        = t(:added_ago, :value => timeago(account.created_at)).html_safe << " | "
-      = t('pluralize.contact', account.contacts.count) << " | "
-      = t('pluralize.opportunity', account.opportunities.count)
+        = t(:added_ago, value: timeago(account.created_at)).html_safe << " | "
+      = t('pluralize.contact', account.contacts_count) + " | "
+      = t('pluralize.opportunity', account.opportunities_count)
 
-    = hook(:account_bottom, self, :account => account)
+    = hook(:account_bottom, self, account: account)

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

@@ -1,12 +1,12 @@
-- amount = account.opportunities.pipeline.map(&:weighted_amount).sum
+- amount = account.pipeline_opportunities.map(&:weighted_amount).sum
 %li.highlight[account]
   - if account.category
-    .strip{:class => account.category} #{t(account.category)}
+    .strip{class: account.category} #{t(account.category)}
   - else
-    .strip{:style => "color: gray;"} #{t :other}
+    .strip{style: "color: gray;"} #{t :other}
 
   %ul.tools
-    = hook(:account_tools_before, self, :account => account)
+    = hook(:account_tools_before, self, account: account)
 
     - if can?(:update, account)
       %li= link_to_edit(account)
@@ -17,17 +17,17 @@
   .indent
     = link_to(account.name, account)
     - if amount != 0.0
-      %span.amount= number_to_currency(amount, :precision => 0)
+      %span.amount= number_to_currency(amount, precision: 0)
     –
     %tt
-      = account.location << ", " unless account.location.blank?
+      = account.location + ", " unless account.location.blank?
       - user_name = account.user.try(:full_name)
       - if user_name
-        = t(:added_by, :time_ago => timeago(account.created_at), :user => h(user_name)).html_safe << " | "
+        = t(:added_by, time_ago: timeago(account.created_at), user: h(user_name)).html_safe << " | "
       - else
-        = t(:added_ago, :value => timeago(account.created_at)).html_safe << " | "
-      = t('pluralize.contact', account.contacts.count) << " | "
-      = t('pluralize.opportunity', account.opportunities.count)
+        = t(:added_ago, value: timeago(account.created_at)).html_safe << " | "
+      = t('pluralize.contact', account.contacts_count) + " | "
+      = t('pluralize.opportunity', account.opportunities_count)
 
     %dt
       = stars_for(account)
@@ -35,8 +35,8 @@
       = " | ".html_safe << link_to_email(account.email) if account.email.present?
       = " | ".html_safe << t(:phone_small) << ": " << (account.toll_free_phone? ? account.toll_free_phone : account.phone) if account.toll_free_phone? || account.phone?
 
-    - if account.tag_list.present?
+    - if account.tags.present?
       %dt
         .tags= tags_for_index(account)
 
-    = hook(:account_bottom, self, :account => account)
+    = hook(:account_bottom, self, account: account)

data/app/views/accounts/_new.html.haml

@@ -1,20 +1,20 @@
-= simple_form_for(@account, :html => one_submit_only, :remote => true) do |f|
+= simple_form_for(@account, html: one_submit_only, remote: true) do |f|
   = link_to_close new_account_path
   = f.hidden_field :user_id
 
-  = f.error_messages :object_name => t('account')
+  = f.error_messages object_name: t('account')
 
-  = render "accounts/top_section",  :f => f
-  = render "fields/edit_custom_field_group", :f => f
-  = render "shared/add_comment", :f => f
-  = render "accounts/contact_info", :f => f
-  = render "fields/groups",  :f => f
-  = render "entities/permissions",  :f => f, :entity => @account
+  = render "accounts/top_section",  f: f
+  = render "fields/edit_custom_field_group", f: f
+  = render "shared/add_comment", f: f
+  = render "accounts/contact_info", f: f
+  = render "fields/groups",  f: f
+  = render "entities/permissions",  f: f, entity: @account
   = hook(:entity_form, self, {f: f, entity: @account})
 
   .buttonbar
     - if Setting.compound_address
-      = f.submit t(:create_account), :onclick => "crm.clear_all_hints()"
+      = f.submit t(:create_account), onclick: "crm.clear_all_hints()"
     - else
       = f.submit t(:create_account)
     #{t :or}

data/app/views/accounts/_sidebar_index.html.haml

@@ -1,20 +1,20 @@
 .filters#filters
   .caption= t :account_categories
   - Setting.account_category.each do |key|
-    .check_box{:style => "border-bottom: 1px silver dotted;"}
-      %div{:style => "float:right;"}
+    .check_box{style: "border-bottom: 1px silver dotted;"}
+      %div{style: "float:right;"}
         = @account_category_total[key]
       = account_category_checkbox(key, @account_category_total[key])
       = label_tag(key, t(key))
 
-  .check_box{:style => "border-bottom: 1px silver dotted;"}
-    %div{:style => "float:right;"}
+  .check_box{style: "border-bottom: 1px silver dotted;"}
+    %div{style: "float:right;"}
       = @account_category_total[:other]
     = account_category_checkbox("other", @account_category_total[:other])
     = label_tag(:other, t(:other))
 
   .check_box
-    %div{:style => "float:right;"}
+    %div{style: "float:right;"}
       %b= @account_category_total[:all]
     %b #{t :total_accounts}
   = hook(:index_account_sidebar_bottom, self)

data/app/views/accounts/_sidebar_show.html.haml

@@ -6,7 +6,7 @@
   %h4= h(@account.name)
   - if @account.website
     %div
-      %b= link_to(truncate(@account.website, :length => 30), @account.website.to_url, :"data-popup" => true, :title => t(:open_in_window, @account.website))
+      %b= link_to(truncate(@account.website, length: 30), @account.website.to_url, :"data-popup" => true, title: t(:open_in_window, @account.website))
   - if @account.email.present?
     %div
       %b= link_to_email(@account.email, 30)
@@ -21,37 +21,37 @@
     - if @account.fax
       #{t :fax}: <b>#{@account.fax}</b><br />
 
-  %div= render "shared/address_show", :asset => @account, :type => 'billing', :title => :billing_address
-  %div= render "shared/address_show", :asset => @account, :type => 'shipping', :title => :shipping_address
+  %div= render "shared/address_show", asset: @account, type: 'billing', title: :billing_address
+  %div= render "shared/address_show", asset: @account, type: 'shipping', title: :shipping_address
 
   .caption #{t :account_summary}
   %li
-    %dt= pipeline != 0.0 ? number_to_currency(pipeline, :precision => 0) : t(:n_a)
+    %dt= pipeline != 0.0 ? number_to_currency(pipeline, precision: 0) : t(:n_a)
     %tt #{t :pipeline}:
   %li
-    %dt= won != 0.0 ? number_to_currency(won, :precision => 0) : t(:n_a)
+    %dt= won != 0.0 ? number_to_currency(won, precision: 0) : t(:n_a)
     %tt #{t :won}:
   %li
-    %dt= lost != 0.0 ? number_to_currency(lost, :precision => 0) : t(:n_a)
+    %dt= lost != 0.0 ? number_to_currency(lost, precision: 0) : t(:n_a)
     %tt #{t :lost}:
   %li
     %dt= @account.category ? t(@account.category) : t(:other)
     %tt #{t :category}:
   %li
-    %span{:style => "float:right;"}= stars_for(@account)
+    %span{style: "float:right;"}= stars_for(@account)
     %tt #{t :rating}:
   %li
-    %dt= @account.assigned_to ? truncate(@account.assignee.full_name, :length => 16) : nil
+    %dt= @account.assigned_to ? truncate(@account.assignee.full_name, length: 16) : nil
     %tt #{t :assigned_to}:
 
   - unless @account.background_info.blank?
     .caption #{t :background_info}
     = auto_link(simple_format @account.background_info)
 
-  = render "fields/sidebar_show", :asset => @account
+  = render "fields/sidebar_show", asset: @account
 
-  - if @account.tag_list.present?
+  - if @account.tags.present?
     %dt
       .tags= tags_for_index(@account)
 
-  = hook(:show_account_sidebar_bottom, self, :account => @account)
+  = hook(:show_account_sidebar_bottom, self, account: @account)

data/app/views/accounts/_title_bar.html.haml

@@ -1,11 +1,11 @@
 #confirm{ hidden }
 .title_tools#menu
-  = link_to_inline(:edit_account, edit_account_path(@account), :text => t(:edit)) + " | "
+  = link_to_inline(:edit_account, edit_account_path(@account), text: t(:edit)) + " | "
   = link_to_function(t(:delete) + '?', confirm_delete(@account))
 .title_tools#buttons
   = view_buttons
 .title#edit_account_title
   = h(@account.name)
-  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
+  = image_tag("loading.gif", size: :thumb, id: "loading", style: "display: none;")
 
 %div#edit_account{ hidden }

data/app/views/accounts/_top_section.html.haml

@@ -1,10 +1,10 @@
-= hook(:account_top_section, self, :f => f) do
+= hook(:account_top_section, self, f: f) do
   .section
     %table
       %tr
         %td(colspan="5")
           .label.top.req #{t :name}:
-          = f.text_field :name, :autofocus => true, :style => "width:500px"
+          = f.text_field :name, autofocus: true, style: "width:500px"
       %tr
         %td
           .label #{t :assigned_to}:
@@ -12,18 +12,18 @@
         %td= spacer
         %td
           .label #{t :category}:
-          = f.select :category, Setting.unroll(:account_category), { :selected => (@account.category || "other").to_sym, :include_blank => t(:other) }, { :style => "width:160px" }
+          = f.select :category, Setting.unroll(:account_category), { selected: (@account.category || "other").to_sym, include_blank: t(:other) }, { style: "width:160px", class: 'select2' }
         %td= spacer
         %td
           .label #{t :rating}:
-          = rating_select "account[rating]", { :id => :account_rating, :selected => @account.rating, :style => "width:160px" }
+          = rating_select "account[rating]", { id: :account_rating, selected: @account.rating, style: "width:160px" }
 
       - if Setting.background_info && Setting.background_info.include?(:account)
         %tr
           %td(colspan="5")
-            .label= t(:background_info) << ':'
-            = f.text_area :background_info, :style =>"width:500px", :rows => 3
+            .label= t(:background_info) + ':'
+            = f.text_area :background_info, style: "width:500px", rows: 3
 
-      = render :partial => "/shared/tags", :locals => {:f => f, :span => 3}
+      = render partial: "/shared/tags", locals: {f: f, span: 3}
 
-      = hook(:account_top_section_bottom, self, :f => f)
+      = hook(:account_top_section_bottom, self, f: f)

data/app/views/accounts/create.js.haml

@@ -6,12 +6,12 @@
   $('##{create_id}_arrow').html(crm.COLLAPSED);
   $('##{create_id}_title').html('#{ j t(entity_name.pluralize) }');
   $('##{create_id}').slideUp(250);
-  $('##{entity_name.pluralize}').prepend('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+  $('##{entity_name.pluralize}').prepend('#{ j render(partial: entity_name, collection: [ @entity ]) }');
   $('##{dom_id(@entity)}').effect("highlight", { duration:1500 });
   = refresh_sidebar(:index, :filters)
-  $('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
+  $('#paginate').html('#{ j render(partial: "shared/paginate_with_per_page") }');
   crm.flick('empty', 'remove');
 - else
-  $('##{create_id}').html('#{ j render(:partial => "new") }');
+  $('##{create_id}').html('#{ j render(partial: "new") }');
   $('##{create_id}').effect("shake", { duration:250, distance: 6 });
   $('#new_#{entity_name} input[type!=hidden]').first().focus();