fat_free_crm 0.16.4 → 0.17.1

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

@@ -6,7 +6,7 @@
     = t(:intro, t(:extra_info_small)) unless edit
   #contact_extra{ hidden_if(collapsed) }
     %table
-      = hook(:contact_extra_details_form, self, :f => f) do
+      = hook(:contact_extra_details_form, self, f: f) do
         %tr
           %td
             .label #{t :job_title}:
@@ -25,12 +25,12 @@
             = f.text_field :mobile
         %tr
           %td
-            = render "shared/address", :f => f, :asset => @contact, :type => 'business', :title => :address
+            = render "shared/address", f: f, asset: @contact, type: 'business', title: :address
           %td= spacer
           %td
             .label #{t :fax}:
             = f.text_field :fax
-            %div{:style => "margin-top:6px"}
+            %div{style: "margin-top:6px"}
               .check_box
                 = f.check_box :do_not_call, {}, true
                 #{t :do_not_call}

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

@@ -1,8 +1,8 @@
 %li.highlight[contact]
-  = avatar_for(contact, :size => "16x16")
+  = avatar_for(contact, size: "16x16")
 
   %ul.tools
-    = hook(:contact_tools_before, self, :contact => contact)
+    = hook(:contact_tools_before, self, contact: contact)
 
     - if can?(:update, contact)
       %li= link_to_edit(contact)
@@ -22,4 +22,4 @@
         –
         == #{t :referred_by_small} #{lead.referred_by}
 
-    = hook(:contact_bottom, self, :contact => contact)
+    = hook(:contact_bottom, self, contact: contact)

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

@@ -1,8 +1,8 @@
 %li.highlight[contact]
-  = avatar_for(contact, :size => "30x30")
+  = avatar_for(contact, size: "30x30")
 
   %ul.tools
-    = hook(:contact_tools_before, self, :contact => contact)
+    = hook(:contact_tools_before, self, contact: contact)
 
     - if can?(:update, contact)
       %li= link_to_edit(contact)
@@ -28,7 +28,7 @@
         –
         == #{t :referred_by_small} #{lead.referred_by}
 
-    %dt{ :style => "padding: 2px 0px 0px 0px" }
+    %dt{ style: "padding: 2px 0px 0px 0px" }
       - if can?(:read, contact)
         - if contact.email.present?
           = link_to_email(contact.email)
@@ -42,16 +42,16 @@
           %b= contact.mobile
           |
       = t(:added_ago, value: timeago(contact.created_at)).html_safe
-    - if contact.tag_list.present?
+    - if contact.tags.present?
       %dt
         .tags= tags_for_index(contact)
 
-    = hook(:contact_bottom, self, :contact => contact)
+    = hook(:contact_bottom, self, contact: contact)
 
-    %dt{ :style => "padding: 2px 0px 0px 0px" }
+    %dt{ style: "padding: 2px 0px 0px 0px" }
       - if can?(:read, contact)
-        = render "contacts/section_general", :contact => contact
-        = render "contacts/section_extra", :contact => contact
-        = render "entities/section_custom_fields", :entity => contact
-        = render "comments/new", :commentable => contact
-      = render :partial => "shared/timeline", :collection => (contact.comments + contact.emails).sort { |x, y| y.created_at <=> x.created_at }
+        = render "contacts/section_general", contact: contact
+        = render "contacts/section_extra", contact: contact
+        = render "entities/section_custom_fields", entity: contact
+        = render "comments/new", commentable: contact
+      = render partial: "shared/timeline", collection: (contact.comments + contact.emails).sort { |x, y| y.created_at <=> x.created_at }

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

@@ -1,8 +1,8 @@
 %li.highlight[contact]
-  = avatar_for(contact, :size => "30x30")
+  = avatar_for(contact, size: "30x30")
 
   %ul.tools
-    = hook(:contact_tools_before, self, :contact => contact)
+    = hook(:contact_tools_before, self, contact: contact)
 
     - if can?(:update, contact)
       %li= link_to_edit(contact)
@@ -22,7 +22,7 @@
         –
         == #{t :referred_by_small} #{lead.referred_by}
 
-    %dt{ :style => "padding: 2px 0px 0px 0px" }
+    %dt{ style: "padding: 2px 0px 0px 0px" }
       - if can?(:read, contact)
         - if contact.email.present?
           = link_to_email(contact.email)
@@ -37,8 +37,8 @@
           |
       = t(:added_ago, value: timeago(contact.created_at)).html_safe
 
-    - if contact.tag_list.present?
+    - if contact.tags.present?
       %dt
         .tags= tags_for_index(contact)
 
-    = hook(:contact_bottom, self, :contact => contact)
+    = hook(:contact_bottom, self, contact: contact)

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

@@ -1,20 +1,20 @@
-= simple_form_for(@contact, :html => one_submit_only, :remote => true) do |f|
+= simple_form_for(@contact, html: one_submit_only, remote: true) do |f|
   = link_to_close new_contact_path
   = f.hidden_field :user_id
   = hidden_field_tag "opportunity", "#{@opportunity.id if @opportunity}"
 
-  = f.error_messages :object_name => t('contact')
+  = f.error_messages object_name: t('contact')
 
-  = render "contacts/top_section", :f => f
-  = render "fields/edit_custom_field_group", :f => f
-  = render "shared/add_comment",   :f => f
-  = render "contacts/extra",       :f => f
-  = render "contacts/web",         :f => f
-  = render "fields/groups",        :f => f
-  = render "entities/permissions", :f => f, :entity => @contact
+  = render "contacts/top_section", f: f
+  = render "fields/edit_custom_field_group", f: f
+  = render "shared/add_comment",   f: f
+  = render "contacts/extra",       f: f
+  = render "contacts/web",         f: f
+  = render "fields/groups",        f: f
+  = render "entities/permissions", f: f, entity: @contact
   = hook(:entity_form, self, {f: f, entity: @contact})
 
   .buttonbar
-    = f.submit t(:create_contact), :onclick => "crm.create_contact()"
+    = f.submit t(:create_contact), onclick: "crm.create_contact()"
     #{t :or}
     = link_to_cancel new_contact_path

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

@@ -16,7 +16,7 @@
         %th=t(:address) + ":"
         %td
           %div
-            %strong= render "shared/address_show", :asset => contact, :type => 'business', :title => nil
+            %strong= render "shared/address_show", asset: contact, type: 'business', title: nil
       %tr
         %th= t(:web_presence)
         %td= web_presence_icons(contact)

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

@@ -23,4 +23,4 @@
     - custom_field_group = contact.field_groups.select{|f| f.name == 'custom_fields'}.first
     - if custom_field_group.present?
       - fields = custom_field_group.fields.without_pairs
-      = render("fields/group_view", :fields => fields, :entity => contact) unless fields.nil?
+      = render("fields/group_view", fields: fields, entity: contact) unless fields.nil?

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

@@ -1,9 +1,9 @@
 .panel#summary
-  %span{:style => "float:right"}= avatar_for(@contact, :size => "50x50")
+  %span{style: "float:right"}= avatar_for(@contact, size: "50x50")
   %h4= h(@contact.full_name)
   = account_with_title_and_department(@contact)
 
-  %div= render "shared/address_show", :asset => @contact, :type => 'business', :title => :address
+  %div= render "shared/address_show", asset: @contact, type: 'business', title: :address
 
   %div
     - unless @contact.phone.blank?
@@ -22,19 +22,19 @@
 
   .caption #{t :contact_summary}
   %li
-    %dt= @contact.assigned_to ? truncate(@contact.assignee.full_name, :length => 16) : nil
+    %dt= @contact.assigned_to ? truncate(@contact.assignee.full_name, length: 16) : nil
     %tt #{t :assigned_to}:
   %li
     %dt
       - if @contact.lead
-        = link_to(truncate(@contact.lead.name, :length => 16), @contact.lead, :title => @contact.lead.name)
+        = link_to(truncate(@contact.lead.name, length: 16), @contact.lead, title: @contact.lead.name)
       - else
         #{t :n_a}
     %tt #{t :lead}:
   %li
     %dt
       - if @contact.lead.try(:campaign)
-        = link_to(truncate(@contact.lead.campaign.name, :length => 16), @contact.lead.campaign, :title => @contact.lead.campaign.name)
+        = link_to(truncate(@contact.lead.campaign.name, length: 16), @contact.lead.campaign, title: @contact.lead.campaign.name)
       - else
         #{t :n_a}
     %tt #{t :campaign}:
@@ -43,10 +43,10 @@
     .caption #{t :background_info}
     = auto_link(simple_format @contact.background_info)
 
-  = render "fields/sidebar_show", :asset => @contact
+  = render "fields/sidebar_show", asset: @contact
 
-  - if @contact.tag_list.present?
+  - if @contact.tags.present?
     %dt
       .tags= tags_for_index(@contact)
 
-  = hook(:show_contact_sidebar_bottom, self, :contact => @contact)
+  = hook(:show_contact_sidebar_bottom, self, contact: @contact)

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

@@ -1,11 +1,11 @@
 #confirm{ hidden }
 .title_tools#menu
-  = link_to_inline(:edit_contact, edit_contact_path(@contact), :text => t(:edit)) + " | "
+  = link_to_inline(:edit_contact, edit_contact_path(@contact), text: t(:edit)) + " | "
   = link_to_function(t(:delete) + '?', confirm_delete(@contact))
 .title_tools#buttons
   = view_buttons
 .title#edit_contact_title
   = h(@contact.full_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_contact{ hidden }

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

@@ -1,14 +1,14 @@
 
-= hook(:contact_top_section, self, :f => f) do
+= hook(:contact_top_section, self, f: f) do
   .section
     %table
       %tr
         %td
-          .label.top.req{ :class => "#{Setting.require_first_names ? 'req' : nil}" } #{t :first_name}:
-          = f.text_field :first_name, :autofocus => true
+          .label.top.req{ class: "#{Setting.require_first_names ? 'req' : nil}" } #{t :first_name}:
+          = f.text_field :first_name, autofocus: true
         %td= spacer
         %td
-          .label.top{ :class => "#{Setting.require_last_names ? 'req' : nil}" } #{t :last_name}:
+          .label.top{ class: "#{Setting.require_last_names ? 'req' : nil}" } #{t :last_name}:
           = f.text_field :last_name
       %tr
         %td
@@ -23,7 +23,7 @@
       = fields_for(@account) do |a|
         = a.hidden_field :user_id
         = a.hidden_field :assigned_to
-        = a.hidden_field :access, :value => Setting.default_access
+        = a.hidden_field :access, value: Setting.default_access
         %tr
           %td
             != account_select_or_create(a) do |options|
@@ -37,9 +37,9 @@
         - if Setting.background_info && Setting.background_info.include?(:contact)
           %tr
             %td(colspan="3")
-              .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(:contact_top_section_bottom, self, :f => f)
+        = hook(:contact_top_section_bottom, self, f: f)

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

@@ -6,18 +6,18 @@
   $('##{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 });
 
   - if called_from_index_page?
     = refresh_sidebar(:index)
-    $('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
+    $('#paginate').html('#{ j render(partial: "shared/paginate_with_per_page") }');
   - else
-    $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
+    $('#recently').replaceWith('#{ j render(partial: "shared/recently") }');
   crm.flick('empty', 'remove');
 
 - else
-  $('##{create_id}').html('#{ j render(:partial => "new") }');
+  $('##{create_id}').html('#{ j render(partial: "new") }');
   crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
   $('##{create_id}').effect("shake", { duration:250, distance: 6 });
   $('#new_#{entity_name} input[type!=hidden]').first().focus();

data/app/views/contacts/destroy.js.haml

@@ -4,6 +4,6 @@
 $('##{dom_id(@entity)}').css('background-color', '#ffe4e1').slideUp(250);
 - if called_from_index_page?
   = refresh_sidebar(:index, :filters)
-  $('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
+  $('#paginate').html('#{ j render(partial: "shared/paginate_with_per_page") }');
 - else
-  $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
+  $('#recently').replaceWith('#{ j render(partial: "shared/recently") }');

data/app/views/contacts/edit.js.haml

@@ -8,7 +8,7 @@
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
   - else                                            # Called from index page...
-    $('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+    $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
 
 
 - else # <----------------------------------------- Show [Edit Contact] form.
@@ -16,7 +16,7 @@
   - if params[:cancel].blank?                       # Called from contacts list item...
     - if @previous                                  # Hide open [Edit Contact] form if any.
       - if @previous.is_a?(Contact)
-        $('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @previous ]) }');
+        $('##{dom_id(@previous)}').replaceWith('#{ j render(partial: entity_name, collection: [ @previous ]) }');
       - else
         crm.flick('#{entity_name}_#{@previous}', 'remove');
     -# Disable onMouseOver for the list item.
@@ -24,10 +24,10 @@
     -# Hide [Create] form if any.
     crm.hide_form('create_#{entity_name}');
     -# Show [Edit] form.
-    $('##{id}').html('#{ j render(:partial => "edit") }');
+    $('##{id}').html('#{ j render(partial: "edit") }');
 
   - elsif params[:cancel].false?                    # Called from title of the contact landing page...
-    $('#edit_#{entity_name}').html('#{ j render(:partial => "edit") }');
+    $('#edit_#{entity_name}').html('#{ j render(partial: "edit") }');
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', "#{t :edit} #{h @entity.full_name}");
 

data/app/views/contacts/index.js.haml

@@ -4,8 +4,8 @@
 - if @entities.any?
   $('##{entities}').html('#{ j render(@entities) }');
 - else
-  $('##{entities}').html('#{ j render(:partial => "shared/empty") }');
+  $('##{entities}').html('#{ j render(partial: "shared/empty") }');
 
-$('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
-$('#export').html('#{ j render(:partial => "shared/export") }');
-$('#search_results_count').html('#{ j render(:plain => t('search_results_count', :count => @search_results_count)) }');
+$('#paginate').html('#{ j render(partial: "shared/paginate_with_per_page") }');
+$('#export').html('#{ j render(partial: "shared/export") }');
+$('#search_results_count').html('#{ j render(plain: t('search_results_count', count: @search_results_count)) }');

data/app/views/contacts/index.xls.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml.Worksheet 'ss:Name' => I18n.t(:tab_contacts) do
   xml.Table do
     unless @contacts.empty?
@@ -94,7 +96,7 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_contacts) do
           data.each do |value|
             xml.Cell do
               xml.Data value,
-                       'ss:Type' => "#{value.respond_to?(:abs) ? 'Number' : 'String'}"
+                       'ss:Type' => (value.respond_to?(:abs) ? 'Number' : 'String').to_s
             end
           end
         end

data/app/views/contacts/new.js.haml

@@ -5,7 +5,7 @@ crm.flick('empty', 'toggle');
 crm.flip_form('#{create_id}');
 
 - unless params[:cancel].true?
-  $('##{create_id}').html('#{ j render(:partial => "new") }');
+  $('##{create_id}').html('#{ j render(partial: "new") }');
   crm.set_title('#{create_id}', '#{ j t(create_id) }');
   -# this function call is the only difference to normal new.js.haml
   crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });

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

@@ -1,22 +1,22 @@
 - if (template = template_for_current_view)
-  = render(template, :contact => @contact)
+  = render(template, contact: @contact)
 - else
 
   -# default view
 
   = styles_for :task, :opportunity
   
-  = render 'contacts/title_bar', :contact => @contact
+  = render 'contacts/title_bar', contact: @contact
 
-  = render "comments/new", :commentable => @contact
-  = render :partial => "shared/timeline", :collection => @timeline
+  = render "comments/new", commentable: @contact
+  = render partial: "shared/timeline", collection: @timeline
 
   = hook(:show_contact_bottom, self, {entity: @contact}) do
 
-    = render :partial => "tasks/tasks", :locals => {:object => @contact}
+    = render partial: "tasks/tasks", locals: {object: @contact}
 
-    = render :partial => "opportunities/opportunities", :locals => {:object => @contact}
+    = render partial: "opportunities/opportunities", locals: {object: @contact}
     
-    = render :partial => "versions/versions", :locals => {:object => @contact}
+    = render partial: "versions/versions", locals: {object: @contact}
 
     = load_select_popups_for(@contact, :tasks, :opportunities)

data/app/views/contacts/show.js.haml

@@ -1,5 +1,5 @@
 - entity_name = controller.controller_name.singularize.underscore #account
 - @entity = instance_variable_get("@#{entity_name}")
 
-$('#main').html('#{ j (render :template => "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
+$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
 = raw generate_js_for_popups(@entity, :tasks, :opportunities)

data/app/views/contacts/update.js.haml

@@ -9,14 +9,14 @@
     crm.set_title('edit_#{entity_name}', '#{h @entity.full_name}');
     = refresh_sidebar(:show, :summary)
   - else
-    $('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+    $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
     $('##{id}').effect("highlight", { duration:1500 });
     - if called_from_index_page?
       = refresh_sidebar(:index)
     - else
-      $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
+      $('#recently').replaceWith('#{ j render(partial: "shared/recently") }');
 - else
-  $('##{id}').html('#{ j render(:partial => "edit") }');
+  $('##{id}').html('#{ j render(partial: "edit") }');
   crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
   $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();

data/app/views/emails/_email.html.haml

@@ -1,10 +1,10 @@
-- truncated = truncate(email.body_inline, :length => 125 - email.subject.to_s.size)
+- truncated = truncate(email.body_inline, length: 125 - email.subject.to_s.size)
 - formatted = email.body_html
 - mediator = email.mediator
 
 %li.mail.highlight[email]
   .body
-    = link_to avatar_for(email.user, :size => :small), user_path(email.user)
+    = link_to avatar_for(email.user, size: :small), user_path(email.user)
     %ul.tools
       - if can?(:destroy, mediator)
         %li= link_to_delete(email)
@@ -20,17 +20,17 @@
         = "from "
         = link_to_email(email.sent_from)
         = ", sent on "
-        = l(email.sent_at, :format => :mmddhhss) << " | "
-        = link_to_function(email.collapsed? ? t(:more) : t(:less), "crm.flip_note_or_email(this, '#{t(:more)}', '#{t(:less)}')", :class => "toggle")
+        = l(email.sent_at, format: :mmddhhss) << " | "
+        = link_to_function(email.collapsed? ? t(:more) : t(:less), "crm.flip_note_or_email(this, '#{t(:more)}', '#{t(:less)}')", class: "toggle")
 
-      %dt{ hidden_if(email.expanded?), :id => dom_id(email, :truncated) }
+      %dt{ hidden_if(email.expanded?), id: dom_id(email, :truncated) }
         %p
           = h(email.subject)
           %tt
             = " - "
             = truncated
 
-      %dt.textile{ hidden_if(email.collapsed?), :id => dom_id(email, :formatted) }
+      %dt.textile{ hidden_if(email.collapsed?), id: dom_id(email, :formatted) }
         .email_content
           %p= h(email.subject)
           = auto_link(formatted)