fat_free_crm 0.13.2 → 0.13.3

data/app/helpers/opportunities_helper.rb

@@ -30,4 +30,19 @@ module OpportunitiesHelper
     end
     summary.compact.join(', ')
   end
+
+  # Generates a select list with the first 25 campaigns
+  # and prepends the currently selected campaign, if any.
+  #----------------------------------------------------------------------------
+  def opportunity_campaign_select(options = {})
+    options[:selected] ||= @opportunity.campaign_id || 0
+    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' }
+  end
+
 end

data/app/helpers/remote_link_pagination_helper.rb

@@ -0,0 +1,8 @@
+module RemoteLinkPaginationHelper
+  class LinkRenderer < WillPaginate::ActionView::LinkRenderer
+    def link(text, target, attributes = {})
+      attributes['data-remote'] = true
+      super
+    end
+  end
+end

data/app/helpers/tags_helper.rb

@@ -22,8 +22,8 @@ module TagsHelper
 
   def tags_for_dashboard(model)
     content_tag(:ul) do
-      model.tag_list.each do |tag|
-        concat(content_tag(:li, tag))
+      model.tags.each do |tag|
+        concat(content_tag(:li, tag.name))
       end
     end.html_safe
   end

data/app/helpers/tasks_helper.rb

@@ -11,12 +11,13 @@ module TasksHelper
   def task_filter_checkbox(view, filter, count)
     name = "filter_by_task_#{view}"
     checked = (session[name] ? session[name].split(",").include?(filter.to_s) : count > 0)
-    onclick = remote_function(
-      :url      => { :action => :filter, :view => view },
-      :with     => "'filter='+this.value+'&checked='+this.checked",
-      :loading  => "$('loading').show()",
-      :complete => "$('loading').hide()"
-    )
+    url = url_for(:action => :filter, :view => view)
+    onclick = %Q{
+      $('#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}")
   end
 
@@ -45,8 +46,14 @@ module TasksHelper
 
   #----------------------------------------------------------------------------
   def link_to_task_complete(pending, bucket)
-    onclick = %Q/$("#{dom_id(pending, :name)}").style.textDecoration="line-through";/
-    onclick << remote_function(:url => complete_task_path(pending), :method => :put, :with => "'bucket=#{bucket}'")
+    onclick = %Q{$("##{dom_id(pending, :name)}").css({textDecoration: "line-through"});}
+    onclick << %Q{$.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)
   end
 
   # Task summary for RSS/ATOM feed.
@@ -79,8 +86,8 @@ module TasksHelper
 
   #----------------------------------------------------------------------------
   def hide_task_and_possibly_bucket(task, bucket)
-    text = "jQuery('##{dom_id(task)}').remove();\n"
-    text << "jQuery('#list_#{h bucket.to_s}').fadeOut({ duration:500 });\n" if Task.bucket_empty?(bucket, current_user, @view)
+    text = "$('##{dom_id(task)}').remove();\n"
+    text << "$('#list_#{h bucket.to_s}').fadeOut({ duration:500 });\n" if Task.bucket_empty?(bucket, current_user, @view)
     text.html_safe
   end
 
@@ -88,21 +95,21 @@ 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 })
-    text = "jQuery('##{dom_id(task)}').html('#{ j html }');\n".html_safe
+    text = "$('##{dom_id(task)}').html('#{ j html }');\n".html_safe
   end
 
   #----------------------------------------------------------------------------
   def insert_content(task, bucket, view)
-    text = "jQuery('#list_#{bucket}').show();\n".html_safe
+    text = "$('#list_#{bucket}').show();\n".html_safe
     html = render(:partial => view, :collection => [ task ], :locals => { :bucket => bucket })
-    text << "jQuery('##{h bucket.to_s}').prepend('#{ j html }');\n".html_safe
-    text << "jQuery('##{dom_id(task)}').effect('highlight', { duration:1500 });\n".html_safe
+    text << "$('##{h bucket.to_s}').prepend('#{ j html }');\n".html_safe
+    text << "$('##{dom_id(task)}').effect('highlight', { duration:1500 });\n".html_safe
     text
   end
 
   #----------------------------------------------------------------------------
   def tasks_flash(message)
-    text = "jQuery('#flash').html('#{ message }');\n"
+    text = "$('#flash').html('#{ message }');\n"
     text << "crm.flash('notice', true)\n"
     text.html_safe
   end

data/app/helpers/users_helper.rb

@@ -17,7 +17,7 @@ module UsersHelper
       %Q[{ name: "#{language}", on_select: function() { #{redraw(:locale, [ locale, language ], url_for(:action => :redraw, :id => current_user))} } }]
     end
   end
-  
+
   def all_users
     User.by_name
   end
@@ -26,7 +26,8 @@ module UsersHelper
     user_options = user_options_for_select(users, myself)
     select(asset, :assigned_to, user_options,
            { :include_blank => t(:unassigned) },
-           { :style         => "width:160px"  })
+           { :style         => "width:160px",
+             :class => 'select2'              })
   end
 
   def user_options_for_select(users, myself)

data/app/mailers/user_mailer.rb

@@ -10,7 +10,7 @@ class UserMailer < ActionMailer::Base
 
     mail :subject => "Fat Free CRM: " + I18n.t(:password_reset_instruction),
          :to => user.email,
-         :from => "Fat Free CRM <noreply@fatfreecrm.com>",
+         :from => from_address,
          :date => Time.now
   end
 
@@ -21,8 +21,14 @@ class UserMailer < ActionMailer::Base
     @assigner_name = assigner.name
     mail :subject => "Fat Free CRM: You have been assigned #{@entity_name} #{@entity_type}",
          :to => entity.assignee.email,
-         :from => "Fat Free CRM <notifications@fatfreecrm.com>"
+         :from => from_address
   end
 
-end
+  private
+
+  def from_address
+    from = Setting.smtp[:from]
+    !from.blank? ? from : "Fat Free CRM <noreply@fatfreecrm.com>"
+  end
 
+end

data/app/models/entities/account_contact.rb

@@ -21,7 +21,7 @@ class AccountContact < ActiveRecord::Base
 
   has_paper_trail :meta => { :related => :contact }, :ignore => [ :id, :created_at, :updated_at, :contact_id ]
 
-  validates_presence_of :account_id, :contact_id
+  validates_presence_of :account_id
 
   ActiveSupport.run_load_hooks(:fat_free_crm_account_contact, self)
 end

data/app/models/fields/custom_field.rb

@@ -136,7 +136,7 @@ class CustomField < Field
       ransack: {attributes: {klass.model_name.singular => {name => label}}}
     })
     # Reset Ransack cache
-    Ransack::Helpers::FormBuilder.cached_searchable_attributes_for_base = {}
+    # Ransack::Helpers::FormBuilder.cached_searchable_attributes_for_base = {}
   end
 
   # Change database column type only if safe to do so

data/app/models/list.rb

@@ -5,6 +5,7 @@
 #------------------------------------------------------------------------------
 class List < ActiveRecord::Base
   validates_presence_of :name
+  validates_presence_of :url
   belongs_to :user
 
   # Parses the controller from the url

data/app/models/observers/entity_observer.rb

@@ -19,7 +19,14 @@ class EntityObserver < ActiveRecord::Observer
   private
 
   def send_notification_to_assignee(item)
-    UserMailer.assigned_entity_notification(item, current_user).deliver if item.assignee.present? && current_user.present?
+    if item.assignee.present? && current_user.present? && can_send_email?
+      UserMailer.assigned_entity_notification(item, current_user).deliver
+    end
+  end
+
+  # Need to have a host set before email can be sent
+  def can_send_email?
+    Setting.host.present?
   end
 
   def current_user
@@ -31,4 +38,6 @@ class EntityObserver < ActiveRecord::Observer
       User.find_by_id(user_id_or_user.to_i)
     end
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_entity_observer, self)
 end

data/app/models/observers/lead_observer.rb

@@ -24,4 +24,6 @@ class LeadObserver < ActiveRecord::Observer
   def log_activity(item, event)
     item.send(item.class.versions_association_name).create(:event => event, :whodunnit => PaperTrail.whodunnit)
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_lead_observer, self)
 end

data/app/models/observers/opportunity_observer.rb

@@ -42,4 +42,6 @@ class OpportunityObserver < ActiveRecord::Observer
   def update_campaign_revenue(campaign, revenue)
     campaign.update_attribute(:revenue, (campaign.revenue || 0) + revenue) if campaign
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_opportunity_observer, self)
 end

data/app/models/observers/task_observer.rb

@@ -26,4 +26,6 @@ class TaskObserver < ActiveRecord::Observer
   def log_activity(item, event)
     item.send(item.class.versions_association_name).create(:event => event, :whodunnit => PaperTrail.whodunnit)
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_task_observer, self)
 end

data/app/models/polymorphic/avatar.rb

@@ -36,6 +36,8 @@ class Avatar < ActiveRecord::Base
     end
   end
   has_attached_file :image, :styles => STYLES.dup, :url => "/avatars/:entity_type/:id/:style_:filename", :default_url => "/assets/avatar.jpg"
+  validates_attachment :image, :presence => true,
+    :content_type => { :content_type => %w(image/jpeg image/jpg image/png image/gif) }
 
   # Convert STYLE symbols to 'w x h' format for Gravatar and Rails
   # e.g. Avatar.size_from_style(:size => :large) -> '75x75'

data/app/models/polymorphic/comment.rb

@@ -44,7 +44,6 @@ class Comment < ActiveRecord::Base
 
   # Notify subscribed users when a comment is added, unless user created this comment
   def notify_subscribers
-    return unless Rails.application.config.action_mailer.smtp_settings.present?
     commentable.subscribed_users.reject{|user_id| user_id == user.id}.each do |subscriber_id|
       if subscriber = User.find_by_id(subscriber_id)
         SubscriptionMailer.comment_notification(subscriber, self).deliver

data/app/models/polymorphic/task.rb

@@ -144,9 +144,7 @@ class Task < ActiveRecord::Base
   # set by Time.now.end_of_week.
   #----------------------------------------------------------------------------
   def at_specific_time?
-    self.due_at &&
-    (self.due_at.hour != 0 || self.due_at.min != 0 || self.due_at.sec != 0) &&
-    (self.due_at.hour != 23 && self.due_at.min != 59 && self.due_at.sec != 59)
+    self.due_at.present? && !due_end_of_day? && !due_beginning_of_day?
   end
 
   # Convert specific due_date to "due_today", "due_tomorrow", etc. bucket name.
@@ -154,21 +152,20 @@ class Task < ActiveRecord::Base
   def computed_bucket
     return self.bucket if self.bucket != "specific_time"
     case
-    when self.due_at < Time.zone.now.midnight
+    when overdue?
       "overdue"
-    when self.due_at >= Time.zone.now.midnight && self.due_at < Time.zone.now.midnight.tomorrow
+    when due_today?
       "due_today"
-    when self.due_at >= Time.zone.now.midnight.tomorrow && self.due_at < Time.zone.now.midnight.tomorrow + 1.day
+    when due_tomorrow?
       "due_tomorrow"
-    when self.due_at >= (Time.zone.now.midnight.tomorrow + 1.day) && self.due_at < Time.zone.now.next_week
+    when due_this_week? && !due_today? && !due_tomorrow?
       "due_this_week"
-    when self.due_at >= Time.zone.now.next_week && self.due_at < (Time.zone.now.next_week.end_of_week + 1.day)
+    when due_next_week?
       "due_next_week"
     else
       "due_later"
     end
   end
-
   # Returns list of tasks grouping them by due date as required by tasks/index.
   #----------------------------------------------------------------------------
   def self.find_all_grouped(user, view)
@@ -227,6 +224,41 @@ class Task < ActiveRecord::Base
     end
   end
 
+  #----------------------------------------------------------------------------
+  def due_end_of_day?
+    self.due_at.present? && (self.due_at == self.due_at.end_of_day)
+  end
+
+  #----------------------------------------------------------------------------
+  def due_beginning_of_day?
+    self.due_at.present? && (self.due_at == self.due_at.beginning_of_day)
+  end
+
+  #----------------------------------------------------------------------------
+  def overdue?
+    self.due_at < Time.zone.now.midnight
+  end
+
+  #----------------------------------------------------------------------------
+  def due_today?
+    self.due_at.between?(Time.zone.now.midnight, Time.zone.now.end_of_day)
+  end
+
+  #----------------------------------------------------------------------------
+  def due_tomorrow?
+    self.due_at.between?(Time.zone.now.midnight.tomorrow, Time.zone.now.tomorrow.end_of_day)
+  end
+
+  #----------------------------------------------------------------------------
+  def due_this_week?
+    self.due_at.between?(Time.zone.now.beginning_of_week, Time.zone.now.end_of_week)
+  end
+
+  #----------------------------------------------------------------------------
+  def due_next_week?
+    self.due_at.between?(Time.zone.now.next_week, Time.zone.now.next_week.end_of_week)
+  end
+
   #----------------------------------------------------------------------------
   def notify_assignee
     if self.assigned_to

data/app/models/users/ability.rb

@@ -23,6 +23,7 @@ class Ability
       can :create, Task
       can :manage, Task, user: user.id
       can :manage, Task, assigned_to: user.id
+      can :manage, Task, completed_by: user.id
 
       # Entities
       can :manage, entities, :access => 'Public'

data/app/models/users/group.rb

@@ -11,10 +11,5 @@ class Group < ActiveRecord::Base
 
   validates :name, :presence => true, :uniqueness => true
 
-  # TODO: Fix chosen bug that makes this necessary
-  def user_ids=(value)
-    super value.join.split(',')
-  end
-
   ActiveSupport.run_load_hooks(:fat_free_crm_group, self)
 end

data/app/models/users/user.rb

@@ -139,13 +139,6 @@ class User < ActiveRecord::Base
     self.single_access_token ||= update_attribute(:single_access_token, Authlogic::Random.friendly_token)
   end
 
-  # Massage value when using Chosen select box which gives values like ["", "1,2,3"]
-  #----------------------------------------------------------------------------
-  def group_ids=(value)
-    value = value.join.split(',').map(&:to_i) if value.map{|v| v.to_s.include?(',')}.any?
-    super(value)
-  end
-
   def to_json(options = nil)
     [name].to_json
   end

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

@@ -10,6 +10,7 @@
     = 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

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

@@ -6,7 +6,7 @@
     .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)
@@ -29,4 +29,4 @@
       = 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

@@ -6,7 +6,7 @@
     .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)
@@ -39,4 +39,4 @@
       %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

@@ -10,6 +10,7 @@
   = 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

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

@@ -17,4 +17,4 @@
     %div{:style => "float:right;"}
       %b= @account_category_total[:all]
     %b #{t :total_accounts}
-  = hook(:index_account_sidebar_bottom, self)
+  = hook(:index_account_sidebar_bottom, self) {}

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

@@ -54,4 +54,4 @@
     %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/_top_section.html.haml

@@ -26,4 +26,4 @@
 
       = 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

@@ -3,15 +3,15 @@
 - create_id = "create_#{entity_name}" # create_account
 
 - if @entity.valid?
-  jQuery('##{create_id}_arrow').html(crm.COLLAPSED);
-  jQuery('##{create_id}_title').html('#{ j t(entity_name.pluralize) }');
-  jQuery('##{create_id}').slideUp(250);
-  jQuery('##{entity_name.pluralize}').prepend('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
-  jQuery('##{dom_id(@entity)}').effect("highlight", { duration:1500 });
+  $('##{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 ]) }');
+  $('##{dom_id(@entity)}').effect("highlight", { duration:1500 });
   = refresh_sidebar(:index, :filters)
-  jQuery('#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
-  jQuery('##{create_id}').html('#{ j render(:partial => "new") }');
-  jQuery('##{create_id}').effect("shake", { duration:250, distance: 6 });
-  jQuery('#new_#{entity_name} input[type!=hidden]').first().focus();
+  $('##{create_id}').html('#{ j render(:partial => "new") }');
+  $('##{create_id}').effect("shake", { duration:250, distance: 6 });
+  $('#new_#{entity_name} input[type!=hidden]').first().focus();