fat_free_crm 0.13.6 → 0.14.0

data/app/helpers/authentications_helper.rb

@@ -5,4 +5,3 @@
 #------------------------------------------------------------------------------
 module AuthenticationsHelper
 end
-

data/app/helpers/campaigns_helper.rb

@@ -4,7 +4,6 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module CampaignsHelper
-
   # Sidebar checkbox control for filtering campaigns by status.
   #----------------------------------------------------------------------------
   def campaign_status_checkbox(status, count)
@@ -16,10 +15,10 @@ module CampaignsHelper
     if target.to_i > 0 && actual.to_i > 0
       if target > actual
         n = 100 - actual * 100 / target
-        html = content_tag(:span, "(-#{number_to_percentage(n, :precision => 1)})", :class => "warn")
+        html = content_tag(:span, "(-#{number_to_percentage(n, precision: 1)})", class: "warn")
       else
         n = actual * 100 / target - 100
-        html = content_tag(:span, "(+#{number_to_percentage(n, :precision => 1)})", :class => "cool")
+        html = content_tag(:span, "(+#{number_to_percentage(n, precision: 1)})", class: "cool")
       end
     end
     html || ""
@@ -28,9 +27,8 @@ module CampaignsHelper
   # Quick campaign summary for RSS/ATOM feeds.
   #----------------------------------------------------------------------------
   def campaign_summary(campaign)
-    status  = render :file => "campaigns/_status.html.haml",  :locals => { :campaign => campaign }
-    metrics = render :file => "campaigns/_metrics.html.haml", :locals => { :campaign => campaign }
-    "#{t(campaign.status)}, " << [ status, metrics ].map { |str| strip_tags(str) }.join(' ').gsub("\n", '')
+    status  = render file: "campaigns/_status.html.haml",  locals: { campaign: campaign }
+    metrics = render file: "campaigns/_metrics.html.haml", locals: { campaign: campaign }
+    "#{t(campaign.status)}, " << [status, metrics].map { |str| strip_tags(str) }.join(' ').gsub("\n", '')
   end
-
 end

data/app/helpers/comments_helper.rb

@@ -4,7 +4,6 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module CommentsHelper
-
   def notification_emails_configured?
     config = Setting.email_comment_replies || {}
     config[:server].present? && config[:user].present? && config[:password].present?

data/app/helpers/contacts_helper.rb

@@ -19,4 +19,3 @@ module ContactsHelper
     summary.join(', ')
   end
 end
-

data/app/helpers/home_helper.rb

@@ -6,33 +6,33 @@
 module HomeHelper
   def sort_by_assets
     Version::ASSETS.map do |asset|
-      %Q[{ name: "#{t(asset.singularize)}", on_select: function() { #{redraw(:asset, [ asset, t(asset.singularize).downcase ], url_for(:action => :redraw))} } }]
+      %[{ name: "#{t(asset.singularize)}", on_select: function() { #{redraw(:asset, [asset, t(asset.singularize).downcase], url_for(action: :redraw))} } }]
     end
   end
 
   #----------------------------------------------------------------------------
   def sort_by_events
     Version::EVENTS.map do |event|
-      %Q[{ name: "#{t(event + '_past_participle')}", on_select: function() { #{redraw(:event, [ event, t(event + '_past_participle').downcase ], url_for(:action => :redraw))} } }]
+      %[{ name: "#{t(event + '_past_participle')}", on_select: function() { #{redraw(:event, [event, t(event + '_past_participle').downcase], url_for(action: :redraw))} } }]
     end
   end
 
   #----------------------------------------------------------------------------
   def sort_by_duration
     Version::DURATION.map do |duration|
-      %Q[{ name: "#{t(duration)}", on_select: function() { #{redraw(:duration, [ duration, t(duration).downcase ], url_for(:action => :redraw))} } }]
+      %[{ name: "#{t(duration)}", on_select: function() { #{redraw(:duration, [duration, t(duration).downcase], url_for(action: :redraw))} } }]
     end
   end
 
   #----------------------------------------------------------------------------
   def sort_by_users
-    users = [[ "all_users", t(:option_all_users) ]] + @all_users.map do |user|
+    users = [["all_users", t(:option_all_users)]] + @all_users.map do |user|
       escaped = sanitize(user.full_name)
-      [ escaped, escaped ]
+      [escaped, escaped]
     end
 
     users.map do |key, value|
-      %Q[{ name: "#{value}", on_select: function() { #{redraw(:user, [ key, (value == t(:option_all_users) ? value.downcase : value) ], url_for(:action => :redraw))} } }]
+      %[{ name: "#{value}", on_select: function() { #{redraw(:user, [key, (value == t(:option_all_users) ? value.downcase : value)], url_for(action: :redraw))} } }]
     end
   end
 
@@ -43,14 +43,14 @@ module HomeHelper
     action  = t('action_' + activity.event)
     type    = t('subject_' + activity.item_type.downcase)
     subject = if item = activity.item
-      if item.respond_to?(:full_name)
-        item.full_name
-      elsif item.respond_to?(:name)
-        item.name
-      end
+                if item.respond_to?(:full_name)
+                  item.full_name
+                elsif item.respond_to?(:name)
+                  item.name
+                end
     end
-    t(:activity_text, :user => user, :action => action, :type => type, :subject => subject,
-      :default => "#{user} #{action} #{type} #{subject}")
+    t(:activity_text, user: user, action: action, type: type, subject: subject,
+                      default: "#{user} #{action} #{type} #{subject}")
   end
 
   # Displays 'not showing' message for a given count, entity and limit
@@ -59,7 +59,7 @@ module HomeHelper
       hidden_count = count - 10
       entity_string = I18n.t("#{hidden_count == 1 ? entity : entity.pluralize}_small")
       content_tag(:p) do
-        t(:not_showing_hidden_entities, :entity => entity_string, :count => hidden_count)
+        t(:not_showing_hidden_entities, entity: entity_string, count: hidden_count)
       end
     end
   end

data/app/helpers/javascript_helper.rb

@@ -0,0 +1,30 @@
+# Copied from prototype-rails which is no longer maintained
+
+module JavascriptHelper
+  #   link_to_function("Show me more", nil, :id => "more_link") do |page|
+  #     page[:details].visual_effect  :toggle_blind
+  #     page[:more_link].replace_html "Show me less"
+  #   end
+  #     Produces:
+  #       <a href="#" id="more_link" onclick="try {
+  #         $(&quot;details&quot;).visualEffect(&quot;toggle_blind&quot;);
+  #         $(&quot;more_link&quot;).update(&quot;Show me less&quot;);
+  #       }
+  #       catch (e) {
+  #         alert('RJS error:\n\n' + e.toString());
+  #         alert('$(\&quot;details\&quot;).visualEffect(\&quot;toggle_blind\&quot;);
+  #         \n$(\&quot;more_link\&quot;).update(\&quot;Show me less\&quot;);');
+  #         throw e
+  #       };
+  #       return false;">Show me more</a>
+  #
+  def link_to_function(name, *args, &block)
+    html_options = args.extract_options!.symbolize_keys
+
+    function = block_given? ? update_page(&block) : args[0] || ''
+    onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function}; return false;"
+    href = html_options[:href] || '#'
+
+    content_tag(:a, name, html_options.merge(href: href, onclick: onclick))
+  end
+end

data/app/helpers/leads_helper.rb

@@ -10,27 +10,27 @@ module LeadsHelper
   def stars_for(lead)
     star = '★'
     rating = lead.rating || 0
-    (star * rating).html_safe + content_tag(:font, (star * (RATING_STARS - rating)).html_safe, :color => 'gainsboro')
+    (star * rating).html_safe + content_tag(:font, (star * (RATING_STARS - rating)).html_safe, color: 'gainsboro')
   end
 
   #----------------------------------------------------------------------------
   def link_to_convert(lead)
     link_to(t(:convert), convert_lead_path(lead),
-      :method => :get,
-      :with   => "{ previous: crm.find_form('edit_lead') }",
-      :remote => true
+            method: :get,
+            with:   "{ previous: crm.find_form('edit_lead') }",
+            remote: true
     )
   end
 
   #----------------------------------------------------------------------------
   def link_to_reject(lead)
-    link_to(t(:reject) + "!", reject_lead_path(lead), :method => :put, :remote => true)
+    link_to(t(:reject) + "!", reject_lead_path(lead), method: :put, remote: true)
   end
 
   #----------------------------------------------------------------------------
   def confirm_reject(lead)
     question = %(<span class="warn">#{t(:reject_lead_confirm)}</span>)
-    yes = link_to(t(:yes_button), reject_lead_path(lead), :method => :put)
+    yes = link_to(t(:yes_button), reject_lead_path(lead), method: :put)
     no = link_to_function(t(:no_button), "$('#menu').html($('#confirm').html());")
     text = "$('#confirm').html( $('#menu').html() );\n"
     text << "$('#menu').html('#{question} #{yes} : #{no}');"
@@ -71,7 +71,7 @@ module LeadsHelper
     summary << (lead.status ? t(lead.status) : t(:other))
 
     if lead.company? && lead.title?
-      summary << t(:works_at, :job_title => lead.title, :company => lead.company)
+      summary << t(:works_at, job_title: lead.title, company: lead.company)
     else
       summary << lead.company if lead.company?
       summary << lead.title if lead.title?

data/app/helpers/opportunities_helper.rb

@@ -4,7 +4,6 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module OpportunitiesHelper
-
   # Sidebar checkbox control for filtering opportunities by stage.
   #----------------------------------------------------------------------------
   def opportunity_stage_checkbox(stage, count)
@@ -16,15 +15,15 @@ module OpportunitiesHelper
   def opportunity_summary(opportunity)
     summary, amount = [], []
     summary << (opportunity.stage ? t(opportunity.stage) : t(:other))
-    summary << number_to_currency(opportunity.weighted_amount, :precision => 0)
+    summary << number_to_currency(opportunity.weighted_amount, precision: 0)
     unless %w(won lost).include?(opportunity.stage)
-      amount << number_to_currency(opportunity.amount || 0, :precision => 0)
-      amount << (opportunity.discount ? t(:discount_number, number_to_currency(opportunity.discount, :precision => 0)) : t(:no_discount))
+      amount << number_to_currency(opportunity.amount || 0, precision: 0)
+      amount << (opportunity.discount ? t(:discount_number, number_to_currency(opportunity.discount, precision: 0)) : t(:no_discount))
       amount << t(:probability_number, (opportunity.probability || 0).to_s + '%')
       summary << amount.join(' ')
     end
     if opportunity.closes_on
-      summary << t(:closing_date, l(opportunity.closes_on, :format => :mmddyy))
+      summary << t(:closing_date, l(opportunity.closes_on, format: :mmddyy))
     else
       summary << t(:no_closing_date)
     end
@@ -39,10 +38,9 @@ module OpportunitiesHelper
     selected_campaign = Campaign.find_by_id(options[:selected])
     campaigns = ([selected_campaign] + Campaign.my.order(:name).limit(25)).compact.uniq
     collection_select :opportunity, :campaign_id, campaigns, :id, :name, options,
-                      {:"data-placeholder" => t(:select_a_campaign),
-                       :"data-url" => auto_complete_campaigns_path(format: 'json'),
-                       :style => "width:330px; display:none;",
-                       :class => 'ajax_chosen' }
+                      :"data-placeholder" => t(:select_a_campaign),
+                      :"data-url" => auto_complete_campaigns_path(format: 'json'),
+                      style: "width:330px; display:none;",
+                      class: 'ajax_chosen'
   end
-
 end

data/app/helpers/passwords_helper.rb

@@ -5,4 +5,3 @@
 #------------------------------------------------------------------------------
 module PasswordsHelper
 end
-

data/app/helpers/tags_helper.rb

@@ -4,7 +4,6 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module TagsHelper
-
   # Generate tag links for use on asset index pages.
   #----------------------------------------------------------------------------
   def tags_for_index(model)
@@ -16,7 +15,7 @@ module TagsHelper
       elsif !query.include?(hashtag)
         query += " #{hashtag}"
       end
-      out << link_to_function(tag, "crm.search_tagged('#{query}', '#{model.class.to_s.tableize}')", :title => tag)
+      out << link_to_function(tag, "crm.search_tagged('#{query}', '#{model.class.to_s.tableize}')", title: tag)
     end
   end
 
@@ -27,5 +26,4 @@ module TagsHelper
       end
     end
   end
-
 end

data/app/helpers/tasks_helper.rb

@@ -4,21 +4,20 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module TasksHelper
-
   # Sidebar checkbox control for filtering tasks by due date -- used for
   # pending and assigned views only.
   #----------------------------------------------------------------------------
   def task_filter_checkbox(view, filter, count)
     name = "filter_by_task_#{view}"
     checked = (session[name] ? session[name].split(",").include?(filter.to_s) : count > 0)
-    url = url_for(:action => :filter, :view => view)
-    onclick = %Q{
+    url = url_for(action: :filter, view: view)
+    onclick = %{
       $('#loading').show();
       $.post('#{url}', {filter: this.value, checked: this.checked}, function () {
         $('#loading').hide();
       });
     }
-    check_box_tag("filters[]", filter, checked, :onclick => onclick, :id => "filters_#{filter.to_s.underscore}")
+    check_box_tag("filters[]", filter, checked, onclick: onclick, id: "filters_#{filter.to_s.underscore}")
   end
 
   #----------------------------------------------------------------------------
@@ -34,32 +33,32 @@ module TasksHelper
 
   #----------------------------------------------------------------------------
   def link_to_task_edit(task, bucket)
-    link_to(t(:edit), edit_task_path(task, :bucket => bucket, :view => @view, :previous => "crm.find_form('edit_task')"),
-      :method => :get, :remote => true)
+    link_to(t(:edit), edit_task_path(task, bucket: bucket, view: @view, previous: "crm.find_form('edit_task')"),
+            method: :get, remote: true)
   end
 
   #----------------------------------------------------------------------------
   def link_to_task_delete(task, bucket)
-    link_to(t(:delete) + "!", task_path(task, :bucket => bucket, :view => @view),
-      :method => :delete, :remote => true)
+    link_to(t(:delete) + "!", task_path(task, bucket: bucket, view: @view),
+            method: :delete, remote: true)
   end
 
   #----------------------------------------------------------------------------
   def link_to_task_complete(pending, bucket)
-    onclick = %Q{$("##{dom_id(pending, :name)}").css({textDecoration: "line-through"});}
-    onclick << %Q{$.ajax("#{complete_task_path(pending)}", {type: "PUT", data: {bucket: "#{bucket}"}});}
+    onclick = %{$("##{dom_id(pending, :name)}").css({textDecoration: "line-through"});}
+    onclick << %{$.ajax("#{complete_task_path(pending)}", {type: "PUT", data: {bucket: "#{bucket}"}});}
   end
 
   #----------------------------------------------------------------------------
   def link_to_task_uncomplete(task, bucket)
-    link_to(t(:task_uncomplete), uncomplete_task_path(task, :bucket => bucket, :view => @view),
-      :method => :put, :remote => true)
+    link_to(t(:task_uncomplete), uncomplete_task_path(task, bucket: bucket, view: @view),
+            method: :put, remote: true)
   end
 
   # Task summary for RSS/ATOM feed.
   #----------------------------------------------------------------------------
   def task_summary(task)
-    summary = [ task.category.blank? ? t(:other) : t(task.category) ]
+    summary = [task.category.blank? ? t(:other) : t(task.category)]
     if @view != "completed"
       if @view == "pending" && task.user != current_user
         summary << t(:task_from, task.user.full_name)
@@ -68,18 +67,18 @@ module TasksHelper
       end
       summary << "#{t(:related)} #{task.asset.name} (#{task.asset_type.downcase})" if task.asset_id?
       summary << if task.bucket == "due_asap"
-        t(:task_due_now)
-      elsif task.bucket == "due_later"
-        t(:task_due_later)
-      else
-        l(task.due_at.localtime, :format => :mmddhhss)
+                   t(:task_due_now)
+                 elsif task.bucket == "due_later"
+                   t(:task_due_later)
+                 else
+                   l(task.due_at.localtime, format: :mmddhhss)
       end
     else # completed
       summary << "#{t(:related)} #{task.asset.name} (#{task.asset_type.downcase})" if task.asset_id?
       summary << t(:task_completed_by,
-                   :time_ago => distance_of_time_in_words(task.completed_at, Time.now),
-                   :date     => l(task.completed_at.localtime, :format => :mmddhhss),
-                   :user     => task.completor.full_name)
+                   time_ago: distance_of_time_in_words(task.completed_at, Time.now),
+                   date:     l(task.completed_at.localtime, format: :mmddhhss),
+                   user:     task.completor.full_name)
     end
     summary.join(', ')
   end
@@ -94,14 +93,14 @@ module TasksHelper
   #----------------------------------------------------------------------------
   def replace_content(task, bucket = nil)
     partial = (task.assigned_to && task.assigned_to != current_user.id) ? "assigned" : "pending"
-    html = render(:partial => "tasks/#{partial}", :collection => [ task ], :locals => { :bucket => bucket })
+    html = render(partial: "tasks/#{partial}", collection: [task], locals: { bucket: bucket })
     text = "$('##{dom_id(task)}').html('#{ j html }');\n".html_safe
   end
 
   #----------------------------------------------------------------------------
   def insert_content(task, bucket, view)
     text = "$('#list_#{bucket}').show();\n"
-    html = render(:partial => view, :collection => [ task ], :locals => { :bucket => bucket })
+    html = render(partial: view, collection: [task], locals: { bucket: bucket })
     text << "$('##{h bucket.to_s}').prepend('#{ j html }');\n"
     text << "$('##{dom_id(task)}').effect('highlight', { duration:1500 });\n"
     text.html_safe
@@ -119,10 +118,10 @@ module TasksHelper
     text = "".html_safe
     if @view == "pending" && @task.assigned_to.present? && @task.assigned_to != current_user.id
       text << hide_task_and_possibly_bucket(task, @task_before_update.bucket)
-      text << tasks_flash( t(:task_assigned, (h @task.assignee.try(:full_name))) + " (#{link_to(t(:view_assigned_tasks), url_for(:controller => :tasks, :view => :assigned))})" )
+      text << tasks_flash(t(:task_assigned, (h @task.assignee.try(:full_name))) + " (#{link_to(t(:view_assigned_tasks), url_for(controller: :tasks, view: :assigned))})")
     elsif @view == "assigned" && @task.assigned_to.blank?
       text << hide_task_and_possibly_bucket(task, @task_before_update.bucket)
-      text << tasks_flash( t(:task_pending) + " (#{link_to(t(:view_pending_tasks), tasks_url)}.")
+      text << tasks_flash(t(:task_pending) + " (#{link_to(t(:view_pending_tasks), tasks_url)}.")
     else
       text << replace_content(@task, @task.bucket)
     end
@@ -137,5 +136,4 @@ module TasksHelper
     text << refresh_sidebar(:index, :filters)
     text
   end
-
 end

data/app/helpers/users_helper.rb

@@ -4,17 +4,16 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module UsersHelper
-
   def language_for(user)
     if user.preference[:locale]
-      locale, language = languages.detect{ |locale, language| locale == user.preference[:locale] }
+      locale, language = languages.detect { |locale, _language| locale == user.preference[:locale] }
     end
     language || "English"
   end
 
   def sort_by_language
     languages.sort.map do |locale, language|
-      %Q[{ name: "#{language}", on_select: function() { #{redraw(:locale, [ locale, language ], url_for(:action => :redraw, :id => current_user))} } }]
+      %[{ name: "#{language}", on_select: function() { #{redraw(:locale, [locale, language], url_for(action: :redraw, id: current_user))} } }]
     end
   end
 
@@ -25,12 +24,12 @@ module UsersHelper
   def user_select(asset, users, myself)
     user_options = user_options_for_select(users, myself)
     select(asset, :assigned_to, user_options,
-           { :include_blank => t(:unassigned) },
-           { :style         => "width:160px",
-             :class => 'select2'              })
+           { include_blank: t(:unassigned) },
+           style:         "width:160px",
+           class: 'select2')
   end
 
   def user_options_for_select(users, myself)
-    (users - [myself]).map{|u| [u.full_name, u.id]}.prepend([t(:myself), myself.id])
+    (users - [myself]).map { |u| [u.full_name, u.id] }.prepend([t(:myself), myself.id])
   end
 end

data/app/helpers/versions_helper.rb

@@ -4,11 +4,10 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module VersionsHelper
-
   # Parse the changes for each version
   #----------------------------------------------------------------------------
   def parse_version(attr_name, change)
-    if attr_name =~ /\Acf_/ and (field = CustomField.where(:name => attr_name).first).present?
+    if attr_name =~ /\Acf_/ && (field = CustomField.where(name: attr_name).first).present?
       label = field.label
       first = field.render(change.first)
       second = field.render(change.second)
@@ -20,15 +19,14 @@ module VersionsHelper
 
     # Find account and link to it.
     if attr_name == 'account_id'
-      if first.present? and (account = Account.find_by_id(first))
+      if first.present? && (account = Account.find_by_id(first))
         first = link_to(h(account.name), account_path(account))
       end
-      if second.present? and (account = Account.find_by_id(second))
+      if second.present? && (account = Account.find_by_id(second))
         second  = link_to(h(account.name), account_path(account))
       end
     end
 
     [label, first, second]
   end
-
 end