fat_free_crm 0.16.4 → 0.17.1

data/app/views/admin/users/confirm.js.haml

@@ -3,5 +3,5 @@
 if ($('##{id}').size() > 0) {
 crm.flick('#{id}', 'remove');
 } else {
-$('##{dom_id(@user)}').prepend('#{ j (render :partial => "confirm") }');
+$('##{dom_id(@user)}').prepend('#{ j (render partial: "confirm") }');
 }

data/app/views/admin/users/create.js.haml

@@ -2,9 +2,9 @@
   $('#create_user_arrow').html(crm.COLLAPSED);
   $('#create_user_title').html('#{t(:users)}');
   $('#create_user').slideUp(250);
-  $('#users').prepend('#{ j (render :partial => "user", :collection => [ @user ]) }');
+  $('#users').prepend('#{ j (render partial: "user", collection: [ @user ]) }');
   $('##{dom_id(@user)}').effect("highlight", { duration:1500 });
 - else
-  $('#create_user').html('#{ j (render :partial => "new") }');
+  $('#create_user').html('#{ j (render partial: "new") }');
   $('#create_user').effect("shake", { duration:250, distance: 6 });
   $('#group_username').focus();

data/app/views/admin/users/edit.js.haml

@@ -1,13 +1,13 @@
 - id = dom_id(@user)
 
 - if params[:cancel].true?     # <----------------- Hide [Edit User]
-  $('##{id}').replaceWith('#{ j render(:partial => "user", :collection => [ @user ]) }');
+  $('##{id}').replaceWith('#{ j render(partial: "user", collection: [ @user ]) }');
 
 - else # <----------------------------------------  Show [Edit User] form.
 
   - if @previous                                    # Hide open [Edit User] form if any.
     - if @previous.is_a?(User)                      # Previous user still exists?
-      $('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => "user", :collection => [ @previous ]) }');
+      $('##{dom_id(@previous)}').replaceWith('#{ j render(partial: "user", collection: [ @previous ]) }');
     - else
       crm.flick('user_#{@previous}', 'remove');
 
@@ -16,5 +16,5 @@
   -# Show [Edit User] form.
   crm.highlight_off('#{id}');
   crm.hide_form('create_user');
-  $('##{id}').html('#{ j render(:partial => "edit") }');
+  $('##{id}').html('#{ j render(partial: "edit") }');
   $('#user_username').focus();

data/app/views/admin/users/index.html.haml

@@ -1,13 +1,13 @@
 = styles_for :user
 
 .title_tools
-  = link_to_inline(:create_user, new_admin_user_path, :text => t(:create_user))
+  = link_to_inline(:create_user, new_admin_user_path, text: t(:create_user))
 
 .title
   %span#create_user_title #{t :users}
-  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
+  = image_tag("loading.gif", size: :thumb, id: "loading", style: "display: none;")
 .remote#create_user{ hidden }
 
-.list#users= render :partial => "admin/users/user", :collection => @users
+.list#users= render partial: "admin/users/user", collection: @users
 #paginate= render "shared/paginate"
 #export= render "shared/export"

data/app/views/admin/users/index.js.haml

@@ -1,2 +1,2 @@
-$('#users').html('#{ j render(:partial => "admin/users/user", :collection => @users) }');
-$('#paginate').html('#{ j render(:partial => "shared/paginate") }')
+$('#users').html('#{ j render(partial: "admin/users/user", collection: @users) }');
+$('#paginate').html('#{ j render(partial: "shared/paginate") }')

data/app/views/admin/users/new.js.haml

@@ -1,7 +1,7 @@
 crm.flip_form('create_user');
 
 - unless params[:cancel].true?
-  $('#create_user').html('#{ j render(:partial => "new") }');
+  $('#create_user').html('#{ j render(partial: "new") }');
   $('#empty').html('');
   crm.set_title('create_user', '#{t(:create_user)}');
 

data/app/views/admin/users/reactivate.js.haml

@@ -1,3 +1,3 @@
 - id = dom_id(@user)
-$('##{id}').replaceWith('#{ j render(:partial => "user", :collection => [ @user ]) }');
+$('##{id}').replaceWith('#{ j render(partial: "user", collection: [ @user ]) }');
 $('##{id}').effect("highlight", { duration:1000 });

data/app/views/admin/users/suspend.js.haml

@@ -1,3 +1,3 @@
 - id = dom_id(@user)
-$('##{id}').replaceWith('#{ j render(:partial => "user", :collection => [ @user ]) }');
+$('##{id}').replaceWith('#{ j render(partial: "user", collection: [ @user ]) }');
 $('##{id}').effect("highlight", { duration:1000 });

data/app/views/admin/users/update.js.haml

@@ -1,9 +1,9 @@
 - id = dom_id(@user)
 
 - if @user.errors.empty?
-  $('##{id}').replaceWith('#{ j render(:partial => "user", :collection => [ @user ]) }')
+  $('##{id}').replaceWith('#{ j render(partial: "user", collection: [ @user ]) }')
   $('##{id}').effect("highlight", { duration:1000 });
 - else
-  $('##{id}').html('#{j render(:partial => "edit") }')
+  $('##{id}').html('#{j render(partial: "edit") }')
   $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('#user_username').focus()

data/app/views/application/_auto_complete.html.haml

@@ -2,9 +2,9 @@
   - unless @auto_complete.blank?
     - @auto_complete.each do |item|
       - name = item.name
-      - name << " (#{item.company})" if item.is_a?(Lead)
-      - name = highlight(truncate(name, :length => 45), @query)
+      - name += " (#{item.company})" if item.is_a?(Lead)
+      - name = highlight(truncate(name, length: 45), @query)
       - name = content_tag(:strike, name) if item.is_a?(Task) && item.completed?
-      %li{ :id => item.to_param }= name
+      %li{ id: item.to_param }= name
   - else
     %li== #{t(:no_match, t(controller.controller_name + '_small'))} <font color="yellow">#{@query}</font>

data/app/views/application/index.atom.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # http://www.atomenabled.org/developers/syndication/
 items  = controller.controller_name
 item   = items.singularize
@@ -5,7 +7,7 @@ assets = controller.instance_variable_get("@#{items}")
 
 if item == 'task'
   assets = assets.values.flatten
-  title  = t(:"#{@view}_tab") << ' ' << t(items.to_sym)
+  title  = t(:"#{@view}_tab") + ' ' + t(items.to_sym)
 end
 
 atom_feed do |feed|
@@ -13,8 +15,8 @@ atom_feed do |feed|
   feed.updated    assets.any? ? assets.max_by(&:updated_at).updated_at : Time.now
   feed.generator  "Fat Free CRM v#{FatFreeCRM::VERSION::STRING}"
   feed.author do |author|
-    author.name  @current_user.full_name
-    author.email @current_user.email
+    author.name  current_user.full_name
+    author.email current_user.email
   end
 
   assets.each do |asset|
@@ -26,9 +28,11 @@ atom_feed do |feed|
         author.name !asset.is_a?(User) ? asset.try(:user).try(:full_name) : asset.full_name
       end
 
-      entry.contributor do |contributor|
-        contributor.name asset.assigned_to_full_name
-      end if asset.respond_to?(:assigned_to_full_name)
+      if asset.respond_to?(:assigned_to_full_name)
+        entry.contributor do |contributor|
+          contributor.name asset.assigned_to_full_name
+        end
+      end
     end
   end
 end

data/app/views/application/index.rss.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # http://cyber.law.harvard.edu/rss/rss.html
 items  = controller.controller_name
 item   = items.singularize
@@ -5,7 +7,7 @@ assets = instance_variable_get("@#{items}")
 
 if item == 'task'
   assets = assets.values.flatten
-  title  = t(:"#{@view}_tab") << ' ' << t(items.to_sym)
+  title  = t(:"#{@view}_tab") + ' ' + t(items.to_sym)
 end
 
 xml.instruct! :xml, version: "1.0"

data/app/views/application/show.atom.builder

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # http://www.atomenabled.org/developers/syndication/
-item   = @items.singularize
+item = @items.singularize
 
 if item == 'task'
   @assets = @assets.values.flatten
-  title  = t(:"#{@view}_tab") << ' ' << t(@items.to_sym)
+  title = "#{t(:"#{@view}_tab")} #{t(@items.to_sym)}"
 end
 
 atom_feed do |feed|
@@ -11,8 +13,8 @@ atom_feed do |feed|
   feed.updated    @assets.any? ? @assets.max_by(&:updated_at).updated_at : Time.now
   feed.generator  "Fat Free CRM v#{FatFreeCRM::VERSION::STRING}"
   feed.author do |author|
-    author.name  @current_user.full_name
-    author.email @current_user.email
+    author.name  current_user.full_name
+    author.email current_user.email
   end
 
   @assets.each do |asset|
@@ -24,9 +26,11 @@ atom_feed do |feed|
         author.name !asset.is_a?(User) ? asset.try(:user).try(:full_name) : asset.full_name
       end
 
-      entry.contributor do |contributor|
-        contributor.name asset.assigned_to_full_name
-      end if asset.respond_to?(:assigned_to_full_name)
+      if asset.respond_to?(:assigned_to_full_name)
+        entry.contributor do |contributor|
+          contributor.name asset.assigned_to_full_name
+        end
+      end
     end
   end
 end

data/app/views/application/show.rss.builder

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # http://cyber.law.harvard.edu/rss/rss.html
-item   = @items.singularize
+item = @items.singularize
 
 if item == 'task'
   @assets = @assets.values.flatten
-  title  = t(:"#{@view}_tab") << ' ' << t(@items.to_sym)
+  title = "#{t(:"#{@view}_tab")} #{t(@items.to_sym)}"
 end
 
 xml.instruct! :xml, version: "1.0"

data/app/views/authentications/new.html.haml

@@ -1,7 +1,7 @@
 .standalone#standalone
   -# The following form gets submitted to #create when @authentication is nil,
   -# or to #update when @authentication is not nil (ex. suspended).
-  = form_for @authentication, :url => authentication_path, :html => one_submit_only do |f|
+  = form_for @authentication, url: authentication_path, html: one_submit_only do |f|
     - if can_signup?
       .title_tools #{t :no_account} #{link_to t(:sign_up_now), signup_path}
     .title= t(:login)

data/app/views/campaigns/_campaign.html.haml

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

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

@@ -1,15 +1,15 @@
 .remote
-  = simple_form_for(@campaign, :html => one_submit_only, :remote => true) do |f|
+  = simple_form_for(@campaign, html: one_submit_only, remote: true) do |f|
     = link_to_close edit_campaign_path(@campaign)
     = f.hidden_field :user_id
 
-    = f.error_messages :object_name => t('campaign')
+    = f.error_messages object_name: t('campaign')
 
-    = render "campaigns/top_section", :f => f, :edit => true
-    = render "fields/edit_custom_field_group", :f => f, :edit => true
-    = render "campaigns/objectives",  :f => f, :edit => true
-    = render "fields/groups",         :f => f, :edit => true
-    = render "entities/permissions",  :f => f, :edit => true, :entity => @campaign
+    = render "campaigns/top_section", f: f, edit: true
+    = render "fields/edit_custom_field_group", f: f, edit: true
+    = render "campaigns/objectives",  f: f, edit: true
+    = render "fields/groups",         f: f, edit: true
+    = render "entities/permissions",  f: f, edit: true, entity: @campaign
     = hook(:entity_form, self, {f: f, entity: @campaign})
 
     .buttonbar

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

@@ -1,5 +1,5 @@
 %li.highlight[campaign]
-  .strip{:class => campaign.status}= t(campaign.status)
+  .strip{class: campaign.status}= t(campaign.status)
 
   %ul.tools
     - if can?(:update, campaign)
@@ -10,6 +10,6 @@
 
   .indent
     = link_to(campaign.name, campaign)
-    = render "campaigns/status", :campaign => campaign
+    = render "campaigns/status", campaign: campaign
 
-    = hook(:campaign_bottom, self, :campaign => campaign)
+    = hook(:campaign_bottom, self, campaign: campaign)

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

@@ -1,5 +1,5 @@
 %li.highlight[campaign]
-  .strip{:class => campaign.status}= t(campaign.status)
+  .strip{class: campaign.status}= t(campaign.status)
 
   %ul.tools
     - if can?(:update, campaign)
@@ -10,11 +10,11 @@
 
   .indent
     = link_to(campaign.name, campaign)
-    = render "campaigns/status", :campaign => campaign
+    = render "campaigns/status", campaign: campaign
 
-    = render "campaigns/metrics", :campaign => campaign
-    - if campaign.tag_list.present?
+    = render "campaigns/metrics", campaign: campaign
+    - if campaign.tags.present?
       %dt
         .tags= tags_for_index(campaign)
 
-    = hook(:campaign_bottom, self, :campaign => campaign)
+    = hook(:campaign_bottom, self, campaign: campaign)

data/app/views/campaigns/_metrics.html.haml

@@ -1,7 +1,7 @@
 - objectives = []
-- objectives << t(:revenue_number, number_to_currency(campaign.target_revenue, :precision => 0)) if campaign.target_revenue
-- objectives << t('pluralize.lead', :count => campaign.target_leads) if campaign.target_leads
-- objectives << t(:conversion_number, number_to_percentage(campaign.target_conversion, :precision => 1)) if campaign.target_conversion
+- objectives << t(:revenue_number, number_to_currency(campaign.target_revenue, precision: 0)) if campaign.target_revenue
+- objectives << t('pluralize.lead', count: campaign.target_leads) if campaign.target_leads
+- objectives << t(:conversion_number, number_to_percentage(campaign.target_conversion, precision: 1)) if campaign.target_conversion
 - unless objectives.empty?
   %dt
     %b #{t :target}:
@@ -9,8 +9,8 @@
 %dt
   - unless objectives.empty?
     %b #{t :actual}:
-  = t(:revenue_number, number_to_currency(campaign.revenue || 0, :precision => 0)) + " | "
+  = t(:revenue_number, number_to_currency(campaign.revenue || 0, precision: 0)) + " | "
   = t('pluralize.lead', campaign.leads_count || 0) + " | "
   = t('pluralize.opportunity', campaign.opportunities_count || 0)
   - if campaign.opportunities_count? && campaign.leads_count? && campaign.leads_count != 0
-    = " | " << t(:conversion_number, number_to_percentage(campaign.opportunities_count * 100 / campaign.leads_count, :precision => 1))
+    = " | " + t(:conversion_number, number_to_percentage(campaign.opportunities_count * 100 / campaign.leads_count, precision: 1))

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

@@ -1,15 +1,15 @@
-= simple_form_for(@campaign, :html => one_submit_only, :remote => true) do |f|
+= simple_form_for(@campaign, html: one_submit_only, remote: true) do |f|
   = link_to_close new_campaign_path
   = f.hidden_field :user_id
 
-  = f.error_messages :object_name => t('campaign')
+  = f.error_messages object_name: t('campaign')
 
-  = render "campaigns/top_section", :f => f
-  = render "fields/edit_custom_field_group", :f => f
-  = render "shared/add_comment", :f => f
-  = render "campaigns/objectives",  :f => f
-  = render "fields/groups",         :f => f
-  = render "entities/permissions",  :f => f, :entity => @campaign
+  = render "campaigns/top_section", f: f
+  = render "fields/edit_custom_field_group", f: f
+  = render "shared/add_comment", f: f
+  = render "campaigns/objectives",  f: f
+  = render "fields/groups",         f: f
+  = render "entities/permissions",  f: f, entity: @campaign
   = hook(:entity_form, self, {f: f, entity: @campaign})
 
   .buttonbar

data/app/views/campaigns/_objectives.html.haml

@@ -11,20 +11,20 @@
       %tr
         %td
           .label #{t :number_of_leads}:
-          = f.text_field :target_leads, :style => "width:110px; text-align:right;"
+          = f.text_field :target_leads, style: "width:110px; text-align:right;"
         %td= spacer
         %td
           .label #{t :conversion_label}:
-          = f.text_field :target_conversion, :style => "width:110px; text-align:right;"
+          = f.text_field :target_conversion, style: "width:110px; text-align:right;"
         %td= spacer
         %td
           .label #{t :revenue_label}:
-          = f.text_field :target_revenue, :value => @campaign.target_revenue ? @campaign.target_revenue.to_i : "", :style => "width:110px; text-align:right;"
+          = f.text_field :target_revenue, value: @campaign.target_revenue ? @campaign.target_revenue.to_i : "", style: "width:110px; text-align:right;"
         %td= spacer
         %td
           .label #{t :budget_label}:
-          = f.text_field :budget, :value => @campaign.budget ? @campaign.budget.to_i : "", :style => "width:110px; text-align:right;"
+          = f.text_field :budget, value: @campaign.budget ? @campaign.budget.to_i : "", style: "width:110px; text-align:right;"
       %tr
-        %td{ :colspan => 7 }
+        %td{ colspan: 7 }
           .label #{t :objectives}:
-          = f.text_area :objectives, :style => "width:500px", :rows => 2
+          = f.text_area :objectives, style: "width:500px", rows: 2

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

@@ -1,20 +1,20 @@
 .filters#filters
   .caption= t :campaign_statuses
   - Setting.campaign_status.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;"}
         = @campaign_status_total[key]
       = campaign_status_checkbox(key, @campaign_status_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;"}
       = @campaign_status_total[:other]
     = campaign_status_checkbox("other", @campaign_status_total[:other])
     = label_tag(:other, t(:other))
 
   .check_box
-    %div{:style => "float:right;"}
+    %div{style: "float:right;"}
       %b= @campaign_status_total[:all]
     %b #{t :total_campaigns}
   = hook(:index_campaign_sidebar_bottom, self)

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

@@ -1,16 +1,16 @@
 .panel#summary
   .caption #{t :campaign_summary}
   %li
-    %dt= @campaign.starts_on ? l(@campaign.starts_on, :format => :mmdd) : t(:n_a)
+    %dt= @campaign.starts_on ? l(@campaign.starts_on, format: :mmdd) : t(:n_a)
     %tt #{t :start_date}:
   %li
-    %dt= @campaign.ends_on ? l(@campaign.ends_on, :format => :mmdd) : t(:n_a)
+    %dt= @campaign.ends_on ? l(@campaign.ends_on, format: :mmdd) : t(:n_a)
     %tt #{t :end_date}:
   %li
     %dt= @campaign.status ? t(@campaign.status) : t(:n_a)
     %tt #{t :status}:
   %li.last
-    %dt= number_to_currency(@campaign.budget, :precision => 0) || t(:n_a)
+    %dt= number_to_currency(@campaign.budget, precision: 0) || t(:n_a)
     %tt #{t :budget}:
 
   .caption #{t :campaign_targets}
@@ -24,7 +24,7 @@
   -# Target Conversion Ratio.
   -#---------------------------------------------------------------------------
   %li
-    %dt= number_to_percentage(@campaign.target_conversion, :precision => 1) || t(:n_a)
+    %dt= number_to_percentage(@campaign.target_conversion, precision: 1) || t(:n_a)
     %tt #{t :conversion}:
 
   -# Target Opportunities: calculated based on target number of leads and
@@ -41,7 +41,7 @@
   -# Target Revenue.
   -#---------------------------------------------------------------------------
   %li.last
-    %dt= number_to_currency(@campaign.target_revenue, :precision => 0) || t(:n_a)
+    %dt= number_to_currency(@campaign.target_revenue, precision: 0) || t(:n_a)
     %tt #{t :revenue}:
 
   .caption #{t :actual_performance}
@@ -58,7 +58,7 @@
   %li
     - if @campaign.opportunities_count.to_i > 0 && @campaign.leads_count.to_i > 0
       - conversion = @campaign.opportunities_count * 100 / @campaign.leads_count
-      %dt= number_to_percentage(conversion, :precision => 1)
+      %dt= number_to_percentage(conversion, precision: 1)
       %tt== #{t :conversion}: #{performance(conversion, @campaign.target_conversion)}
     - else
       %dt #{t :n_a}
@@ -75,17 +75,17 @@
   -# Actual Revenue.
   -#---------------------------------------------------------------------------
   %li.last
-    %dt= number_to_currency(@campaign.revenue, :precision => 0) || t(:n_a)
+    %dt= number_to_currency(@campaign.revenue, precision: 0) || t(:n_a)
     %tt== #{t :revenue}: #{performance(@campaign.revenue, @campaign.target_revenue)}
 
   - unless @campaign.background_info.blank?
     .caption #{t :background_info}
     = auto_link(simple_format @campaign.background_info)
 
-  = render "fields/sidebar_show", :asset => @campaign
+  = render "fields/sidebar_show", asset: @campaign
 
-  - if @campaign.tag_list.present?
+  - if @campaign.tags.present?
     %dt
       .tags= tags_for_index(@campaign)
 
-  = hook(:show_campaign_sidebar_bottom, self, :campaign => @campaign)
+  = hook(:show_campaign_sidebar_bottom, self, campaign: @campaign)