fat_free_crm 0.11.1 → 0.11.2

data/app/models/entities/account.rb

@@ -49,6 +49,8 @@ class Account < ActiveRecord::Base
   has_one     :shipping_address, :dependent => :destroy, :as => :addressable, :class_name => "Address", :conditions => "address_type = 'Shipping'"
   has_many    :emails, :as => :mediator
 
+  serialize :subscribed_users, Set
+
   accepts_nested_attributes_for :billing_address, :allow_destroy => true
   accepts_nested_attributes_for :shipping_address, :allow_destroy => true
 
@@ -66,7 +68,7 @@ class Account < ActiveRecord::Base
   uses_user_permissions
   acts_as_commentable
   acts_as_taggable_on :tags
-  has_paper_trail
+  has_paper_trail :ignore => [ :subscribed_users ]
   has_fields
   exportable
   sortable :by => [ "name ASC", "rating DESC", "created_at DESC", "updated_at DESC" ], :default => "created_at DESC"

data/app/models/entities/campaign.rb

@@ -49,6 +49,8 @@ class Campaign < ActiveRecord::Base
   has_many    :opportunities, :dependent => :destroy, :order => "id DESC"
   has_many    :emails, :as => :mediator
 
+  serialize :subscribed_users, Set
+
   scope :state, lambda { |filters|
     where('status IN (?)' + (filters.delete('other') ? ' OR status IS NULL' : ''), filters)
   }
@@ -63,7 +65,7 @@ class Campaign < ActiveRecord::Base
   uses_user_permissions
   acts_as_commentable
   acts_as_taggable_on :tags
-  has_paper_trail
+  has_paper_trail :ignore => [ :subscribed_users ]
   has_fields
   exportable
   sortable :by => [ "name ASC", "target_leads DESC", "target_revenue DESC", "leads_count DESC", "revenue DESC", "starts_on DESC", "ends_on DESC", "created_at DESC", "updated_at DESC" ], :default => "created_at DESC"

data/app/models/entities/contact.rb

@@ -60,6 +60,8 @@ class Contact < ActiveRecord::Base
   has_one     :business_address, :dependent => :destroy, :as => :addressable, :class_name => "Address", :conditions => "address_type = 'Business'"
   has_many    :emails, :as => :mediator
 
+  serialize :subscribed_users, Set
+
   accepts_nested_attributes_for :business_address, :allow_destroy => true
 
   scope :created_by, lambda { |user| { :conditions => [ "user_id = ?", user.id ] } }
@@ -82,7 +84,7 @@ class Contact < ActiveRecord::Base
   uses_user_permissions
   acts_as_commentable
   acts_as_taggable_on :tags
-  has_paper_trail
+  has_paper_trail :ignore => [ :subscribed_users ]
   has_fields
   exportable
   sortable :by => [ "first_name ASC",  "last_name ASC", "created_at DESC", "updated_at DESC" ], :default => "created_at DESC"

data/app/models/entities/lead.rb

@@ -57,6 +57,8 @@ class Lead < ActiveRecord::Base
   has_one     :business_address, :dependent => :destroy, :as => :addressable, :class_name => "Address", :conditions => "address_type='Business'"
   has_many    :emails, :as => :mediator
 
+  serialize :subscribed_users, Set
+
   accepts_nested_attributes_for :business_address, :allow_destroy => true
 
   scope :state, lambda { |filters|
@@ -75,7 +77,7 @@ class Lead < ActiveRecord::Base
   uses_user_permissions
   acts_as_commentable
   acts_as_taggable_on :tags
-  has_paper_trail
+  has_paper_trail :ignore => [ :subscribed_users ]
   has_fields
   exportable
   sortable :by => [ "first_name ASC", "last_name ASC", "company ASC", "rating DESC", "created_at DESC", "updated_at DESC" ], :default => "created_at DESC"
@@ -125,7 +127,7 @@ class Lead < ActiveRecord::Base
     opportunity = Opportunity.create_for(self, account, params[:opportunity], params[:users])
     contact     = Contact.create_for(self, account, opportunity, params)
 
-    return account, opportunity, contact
+    [account, opportunity, contact]
   end
 
   #----------------------------------------------------------------------------
@@ -162,7 +164,8 @@ class Lead < ActiveRecord::Base
   end
   alias :name :full_name
 
-  private
+private
+
   #----------------------------------------------------------------------------
   def increment_leads_count
     if self.campaign_id
@@ -182,6 +185,4 @@ class Lead < ActiveRecord::Base
   def users_for_shared_access
     errors.add(:access, :share_lead) if self[:access] == "Shared" && !self.permissions.any?
   end
-
 end
-

data/app/models/entities/opportunity.rb

@@ -48,6 +48,8 @@ class Opportunity < ActiveRecord::Base
   has_many    :tasks, :as => :asset, :dependent => :destroy#, :order => 'created_at DESC'
   has_many    :emails, :as => :mediator
 
+  serialize :subscribed_users, Set
+
   scope :state, lambda { |filters|
     where('stage IN (?)' + (filters.delete('other') ? ' OR stage IS NULL' : ''), filters)
   }
@@ -71,7 +73,7 @@ class Opportunity < ActiveRecord::Base
   uses_user_permissions
   acts_as_commentable
   acts_as_taggable_on :tags
-  has_paper_trail
+  has_paper_trail :ignore => [ :subscribed_users ]
   has_fields
   exportable
   sortable :by => [ "name ASC", "amount DESC", "amount*probability DESC", "probability DESC", "closes_on ASC", "created_at DESC", "updated_at DESC" ], :default => "created_at DESC"

data/app/models/fields/field.rb

@@ -112,7 +112,7 @@ class Field < ActiveRecord::Base
     when 'date'
       value && value.strftime(I18n.t("date.formats.default"))
     when 'datetime'
-      value && value.strftime(I18n.t("time.formats.short"))
+      value && value.strftime(I18n.t("time.formats.long"))
     when 'check_boxes'
       value = YAML.load(value) if value.is_a?(String)
       value.select(&:present?).in_groups_of(2, false).map {|g| g.join(', ')}.join("<br />".html_safe) if Array === value

data/app/models/polymorphic/comment.rb

@@ -41,6 +41,40 @@ class Comment < ActiveRecord::Base
   has_paper_trail :meta => { :related => :commentable },
                   :ignore => [:state]
 
+  before_create :subscribe_mentioned_users
+  after_create  :subscribe_user_to_entity, :notify_subscribers
+
   def expanded?;  self.state == "Expanded";  end
   def collapsed?; self.state == "Collapsed"; end
+
+  private
+  # Add user to subscribed_users field on entity
+  def subscribe_user_to_entity(u = user)
+    commentable.subscribed_users << u.id
+    commentable.save
+  end
+
+  # Notify subscribed users when a comment is added, unless user created this comment
+  def notify_subscribers
+    commentable.subscribed_users.reject{|user_id| user_id == user.id}.each do |subscriber_id|
+      if subscriber = User.find_by_id(subscriber_id)
+        # Only send email if SMTP settings are configured
+        if Rails.application.config.action_mailer.smtp_settings.present?
+          SubscriptionMailer.comment_notification(subscriber, self).deliver
+        end
+      end
+    end
+  end
+
+  # If a user is mentioned in the comment body, subscribe them to the entity
+  # before creation, so that they are sent an email notification
+  def subscribe_mentioned_users
+    # Scan for usernames mentioned in the comment,
+    # e.g. "Hi @example_user, take a look at this lead. Please show @another_user"
+    comment.scan(/@([a-zA-Z0-9_-]+)/).map(&:first).each do |username|
+      if (mentioned_user = User.find_by_username(username))
+        subscribe_user_to_entity(mentioned_user)
+      end
+    end
+  end
 end

data/app/models/{entities → polymorphic}/task.rb

@@ -45,6 +45,8 @@ class Task < ActiveRecord::Base
   belongs_to :completor, :class_name => "User", :foreign_key => :completed_by
   belongs_to :asset, :polymorphic => true
 
+  serialize :subscribed_users, Set
+
   # Tasks created by the user for herself, or assigned to her by others. That's
   # what gets shown on Tasks/Pending and Tasks/Completed pages.
   scope :my, lambda { |*args|
@@ -97,7 +99,7 @@ class Task < ActiveRecord::Base
   }
 
   acts_as_commentable
-  has_paper_trail :meta => { :related => :asset }
+  has_paper_trail :meta => { :related => :asset }, :ignore => [ :subscribed_users ]
   has_fields
   exportable
 
@@ -231,10 +233,21 @@ class Task < ActiveRecord::Base
   rescue ArgumentError
     errors.add(:calendar, :invalid_date)
   end
-
+  
   #----------------------------------------------------------------------------
   def parse_calendar_date
-    DateTime.strptime(self.calendar, I18n.t(Setting.task_calendar_with_time ? 'time.formats.mmddyyyy_hhmm' : 'date.formats.mmddyyyy')).utc
+    translate_month_and_day_names!(self.calendar) unless I18n.locale == :"en-US"
+    
+    DateTime.strptime(self.calendar,
+                      I18n.t(Setting.task_calendar_with_time ? 'time.formats.mmddyyyy_hhmm' : 'date.formats.mmddyyyy')).utc
+  end
+  
+  # Translates month and day names of a given datetime string.
+  #----------------------------------------------------------------------------
+  def translate_month_and_day_names!(date_string)
+    translated = I18n.t([:month_names, :abbr_month_names, :day_names, :abbr_day_names], :scope => :date).flatten.compact
+    original   = (Date::MONTHNAMES + Date::ABBR_MONTHNAMES + Date::DAYNAMES + Date::ABBR_DAYNAMES).compact
+    translated.each_with_index { |name, i| date_string.gsub!(name, original[i]) }
   end
 end
 

data/app/models/setting.rb

@@ -27,7 +27,7 @@
 #
 
 # Fat Free CRM settings are stored in three places, and are loaded in the following order:
-# 
+#
 # 1) config/settings.default.yml
 # 2) config/settings.yml  (if exists)
 # 3) 'settings' table in database  (if exists)
@@ -44,16 +44,16 @@ class Setting < ActiveRecord::Base
   @@cache = @@yaml_settings = {}.with_indifferent_access
 
   class << self
-  
+
     # Cache should be cleared before each request.
     def clear_cache!
       @@cache = {}.with_indifferent_access
     end
-  
+
     #-------------------------------------------------------------------
     def method_missing(method, *args)
       begin
-        super(method, *args)
+        super
       rescue NoMethodError
         method_name = method.to_s
         if method_name.last == "="
@@ -70,30 +70,30 @@ class Setting < ActiveRecord::Base
       # Return value if cached
       return cache[name] if cache.has_key?(name)
       # Check database
-      if database_and_table_exists? 
-        if setting = self.find_by_name(name)
+      if database_and_table_exists?
+        if setting = self.find_by_name(name.to_s)
           unless setting.value.nil?
             return cache[name] = setting.value
           end
         end
       end
-      # Check YAML settings 
+      # Check YAML settings
       if yaml_settings.has_key?(name)
         return cache[name] = yaml_settings[name]
       end
     end
-      
+
 
     # Set setting value
     #-------------------------------------------------------------------
     def []=(name, value)
       return nil unless database_and_table_exists?
-      setting = self.find_by_name(name) || self.new(:name => name)
+      setting = self.find_by_name(name.to_s) || self.new(:name => name)
       setting.value = value
       setting.save
       cache[name] = value
     end
-       
+
 
     # Unrolls [ :one, :two ] settings array into [[ "One", :one ], [ "Two", :two ]]
     # picking symbol translations from locale. If setting is not a symbol but
@@ -109,12 +109,12 @@ class Setting < ActiveRecord::Base
       # instead of crashing the entire application.
       table_exists? rescue false
     end
-    
-    
+
+
     # Loads settings from YAML files
     def load_settings_from_yaml
       @@yaml_settings = {}.with_indifferent_access
-      
+
       setting_files = [
         FatFreeCRM.root.join("config", "settings.default.yml"),
         Rails.root.join("config", "settings.yml")
@@ -125,8 +125,8 @@ class Setting < ActiveRecord::Base
         if File.exist?(file)
           begin
             settings = YAML.load_file(file)
-            # Merge settings into current settings hash
-            @@yaml_settings.merge!(settings)
+            # Merge settings into current settings hash (recursively)
+            @@yaml_settings.deep_merge!(settings)
           rescue Exception => ex
             puts "Settings couldn't be loaded from #{file}: #{ex.message}"
           end

data/app/models/users/ability.rb

@@ -1,13 +1,20 @@
+# See the wiki for details: https://github.com/ryanb/cancan/wiki/Defining-Abilities
+
 class Ability
   include CanCan::Ability
 
   def initialize(user)
-    # See the wiki for details: https://github.com/ryanb/cancan/wiki/Defining-Abilities
-    can :create, :all
-    can [:read, :update, :destroy], :all, :access => 'Public'
     if user.present?
-      can [:read, :update, :destroy], :all, :user_id => user.id
-      can [:read, :update, :destroy], :all, :permissions => {:user_id => user.id}
+      entities = [Account, Campaign, Contact, Lead, Opportunity]
+
+      can :create, :all
+      can :manage, entities, :access => 'Public'
+      can :manage, entities + [Task], :user_id => user.id
+
+      entities.each do |klass|
+        permissions = user.permissions.where(:asset_type => klass.name)
+        can :manage, klass, :id => permissions.map(&:asset_id)
+      end
     end
   end
 end

data/app/models/users/user.rb

@@ -80,11 +80,16 @@ class User < ActiveRecord::Base
     where('upper(username) LIKE upper(:s) OR upper(first_name) LIKE upper(:s) OR upper(last_name) LIKE upper(:s)', :s => "#{query}%")
   }
 
+  scope :my, lambda {
+    current_ability = Ability.new(User.current_user)
+    accessible_by(current_ability)
+  }
+
   acts_as_authentic do |c|
     c.session_class = Authentication
     c.validates_uniqueness_of_login_field_options = { :message => :username_taken }
     c.validates_length_of_login_field_options     = { :minimum => 1, :message => :missing_username }
-    c.merge_validates_format_of_login_field_options(:with => /.*/)
+    c.merge_validates_format_of_login_field_options(:with => /[a-zA-Z0-9_-]+/)
 
     c.validates_uniqueness_of_email_field_options = { :message => :email_in_use }
     c.validates_length_of_password_field_options  = { :minimum => 0, :allow_blank => true, :if => :require_password? }
@@ -126,7 +131,7 @@ class User < ActiveRecord::Base
   #----------------------------------------------------------------------------
   def deliver_password_reset_instructions!
     reset_perishable_token!
-    Notifier.password_reset_instructions(self).deliver
+    UserMailer.password_reset_instructions(self).deliver
   end
 
   # Override global I18n.locale if the user has individual local preference.

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

@@ -11,7 +11,7 @@
   = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
 .remote#options{ hidden }
 .remote#advanced_search{ hidden_if(!params[:q]) }
-  - if @search
+  - if params[:q]
     = render :partial => "advanced_search"
 .remote#create_account{ hidden }
 

data/app/views/accounts/index.js.rjs

@@ -1,4 +1,4 @@
-unless @accounts.blank?
+if @accounts.any?
   page[:accounts].replace_html render @accounts
 else
   page[:accounts].replace_html :partial => "shared/empty"

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

@@ -1,9 +1,3 @@
-= styles_for :plugin
-
 .title Plugins
 
-.list#plugins
-  - if @plugins.any?
-    = render :partial => "admin/plugins/plugin", :collection => @plugins
-  - else
-    = render "shared/empty"
+%p #{t :not_implemented}

data/app/views/{shared → application}/index.atom.builder

@@ -11,7 +11,7 @@ end
 atom_feed do |feed|
   feed.title      title || t(items.to_sym)
   feed.updated    assets.any? ? assets.max { |a, b| a.updated_at <=> b.updated_at }.updated_at : Time.now
-  feed.generator  "Fat Free CRM v#{FatFreeCRM::Version}"
+  feed.generator  "Fat Free CRM v#{FatFreeCRM::VERSION::STRING}"
   feed.author do |author|
     author.name  @current_user.full_name
     author.email @current_user.email

data/app/views/{shared → application}/index.rss.builder

@@ -11,7 +11,7 @@ end
 xml.instruct! :xml, :version => "1.0"
 xml.rss :version => "2.0" do
   xml.channel do
-    xml.generator  "Fat Free CRM v#{FatFreeCRM::Version}"
+    xml.generator  "Fat Free CRM v#{FatFreeCRM::VERSION::STRING}"
     xml.link       send(:"#{items}_url")
     xml.pubDate    Time.now.to_s(:rfc822)
     xml.title      title || t(items.to_sym)

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

@@ -11,7 +11,7 @@
   = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
 .remote#options{ hidden }
 .remote#advanced_search{ hidden_if(!params[:q]) }
-  - if @search
+  - if params[:q]
     = render :partial => "advanced_search"
 .remote#create_campaign{ hidden }
 

data/app/views/campaigns/index.js.rjs

@@ -1,4 +1,4 @@
-unless @campaigns.blank?
+if @campaigns.any?
   page[:campaigns].replace_html render @campaigns
 else
   page[:campaigns].replace_html :partial => "shared/empty"

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

@@ -1,6 +1,10 @@
 - class_name = commentable.class.name.downcase
 - id_prefix = "#{class_name}_#{commentable.id}"
 .comment.highlight.new_comment{ :id => "#{id_prefix}_comment_new" }
+  - subscribed_users = commentable.subscribed_users.map{|uid| User.find_by_id(uid) unless uid == @current_user.id }.compact
+  - if notification_emails_configured? && subscribed_users.any?
+    = t(:following_users_will_be_notified) << ":"
+    = subscribed_user_links(subscribed_users)
 
   -# Two hidden fields store the IDs of notes and emails shown for the asset. These IDs are used
   -# by [Expand/Collapse All]. The contents gets updated by actions such as [Add] or [Delete].
@@ -25,3 +29,5 @@
   %div{ {:id => "#{id_prefix}_ask"}.merge(hidden_if(false))}
     = text_field_tag :post_new_note, t(:add_note_help), :onclick => remote_function(:url => new_comment_path("#{class_name}_id" => commentable), :method => :get), :id => "#{id_prefix}_post_new_note"
 
+  - if notification_emails_configured?
+    = render :partial => "comments/subscription_links", :locals => {:entity => commentable}

data/app/views/comments/_subscription_links.html.haml

@@ -0,0 +1,13 @@
+- class_name = entity.class.name.downcase
+- id_prefix = "#{class_name}_#{entity.id}"
+
+- subscribed = entity.subscribed_users.include?(current_user.id)
+
+- if subscribed
+  - link_text, action = [t(:disable_email_subscriptions), "unsubscribe"]
+- else
+  - link_text, action = [t(:subscribe_via_email), "subscribe"]
+
+%div{:id => "#{id_prefix}_subscribe", :class => "comment_subscriptions"}
+  = image_tag "notifications.png", :title => t(:notifications_tooltip)
+  = link_to link_text, url_for(:controller => class_name.pluralize, :action => action, :id => entity.id), :remote => true, :method => :post