fat_free_crm 0.11.1 → 0.11.2

data/app/views/comments/new.js.rjs

@@ -10,3 +10,5 @@ else
   page["#{id_prefix}_ask"].show
 end
 
+
+page.call "crm.textarea_user_autocomplete", "#{id_prefix}_comment_comment"

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

@@ -25,19 +25,9 @@
         = a.hidden_field :access, :value => Setting.default_access
         %tr
           %td
-            .label
-              #{t :account}
-              %span#account_create_title
-                (#{t :create_new} #{t :or} <a href='#' onclick='crm.select_account(1); return false;'>#{t :select_existing}</a>):
-              %span#account_select_title
-                (<a href='#' onclick='crm.create_account(1); return false;'>#{t :create_new}</a> #{t :or} #{t :select_existing}):
-              %span#account_disabled_title :
-
-            -# Add [-- None --] account choice when editing existing contact that has an account.
-            - options = {} and (options[:include_blank] = "" unless @contact.new_record? || @contact.account.blank?)
-            = account_select(options)
-
-            = a.text_field :name, :style => "width:324px; display:none;"
+            != account_select_or_create(a) do |options|
+              - # Add [-- None --] account choice when editing existing contact that has an account.
+              - options[:include_blank] = "" unless @contact.new_record? || @contact.account.blank?
           %td= spacer
           %td
             .label #{t :assigned_to}:

data/app/views/contacts/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_contact{ hidden }

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

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

data/app/views/{notifier/dropbox_ack_notification.html.haml → dropbox_mailer/dropbox_notification.html.haml}

@@ -1,7 +1,7 @@
 :plain
-  #{I18n.t(:dropbox_ack_intro)}:
+  #{I18n.t(:dropbox_notification_intro)}:
 
-  #{I18n.t(:dropbox_ack_to)}:
+  #{I18n.t(:dropbox_notification_to)}:
   #{@mediator_links}
   
   #{I18n.t(:subject)}: #{@subject}

data/app/views/{shared → entities}/attach.js.rjs

@@ -10,6 +10,7 @@ if @attached
       "assigned"
     end
     page.insert_html :top, :tasks, :partial => "tasks/#{view}", :collection => [ @attachment ], :locals => { :bucket => @attachment.computed_bucket }
+
   else
     page.insert_html :top, params[:assets], :partial => "#{params[:assets]}/#{partial}", :collection => [ @attachment ]
     if called_from_landing_page?(:accounts)
@@ -18,7 +19,6 @@ if @attached
       page << refresh_sidebar_for(:campaigns, :show, :summary)
     end
   end
-
 end
 
 page["#{partial}_#{params[:asset_id]}"].visual_effect :highlight, :duration => 1.5

data/app/views/entities/contacts.js.rjs

@@ -1,3 +1,3 @@
-contacts = @entity.contacts.paginate(:page => params[:page], :per_page => 20)
+contacts = entity.contacts.paginate(:page => params[:page], :per_page => 20)
 page['contacts'].replace_html :partial => 'contacts/contact', :collection => contacts
 page['contacts_pagination'].replace_html will_paginate(contacts, :container => false, :params => {:action => :contacts})

data/app/views/entities/leads.js.rjs

@@ -1,3 +1,3 @@
-leads = @entity.leads.paginate(:page => params[:page], :per_page => 20)
+leads = entity.leads.paginate(:page => params[:page], :per_page => 20)
 page['leads'].replace_html :partial => 'leads/lead', :collection => leads
 page['leads_pagination'].replace_html will_paginate(leads, :container => false, :params => {:action => :leads})

data/app/views/entities/opportunities.js.rjs

@@ -1,3 +1,3 @@
-opportunities = @entity.opportunities.paginate(:page => params[:page], :per_page => 20)
+opportunities = entity.opportunities.paginate(:page => params[:page], :per_page => 20)
 page['opportunities'].replace_html :partial => 'opportunities/opportunity', :collection => @opportunities
 page['opportunities_pagination'].replace_html will_paginate(opportunities, :container => false, :params => {:action => :opportunities})

data/app/views/entities/subscription_update.js.rjs

@@ -0,0 +1,4 @@
+class_name = entity.class.name.downcase
+id = "#{class_name}_#{entity.id}_subscribe"
+
+page[id].replace :partial => "comments/subscription_links", :locals => {:entity => entity}

data/app/views/entities/versions.js.rjs

@@ -1,3 +1,3 @@
-versions = Version.history(@entity).paginate(:page => params[:page], :per_page => 10)
+versions = Version.history(entity).paginate(:page => params[:page], :per_page => 10)
 page['versions'].replace_html :partial => 'versions/version', :collection => versions
 page['versions_pagination'].replace_html will_paginate(versions, :container => false, :params => {:action => :versions})

data/app/views/layouts/_footer.html.haml

@@ -1,6 +1,6 @@
 #footer
   Powered by #{link_to "Fat Free CRM", "http://www.fatfreecrm.com", :"data-popup" => true }
-  v#{FatFreeCRM::VERSION} © 2008-#{Date.today.year} by Michael Dvorkin
+  v#{FatFreeCRM::VERSION::STRING} © 2008-#{Date.today.year} by Michael Dvorkin
   \|
   = image_tag "iconset_attribution.png"
   Icons from the 

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

@@ -20,6 +20,9 @@
 
     :javascript
       #{yield :javascript}
+      var _ffcrm_users = [
+      #{User.all.map{|u| "\"#{u.full_name} (@#{u.username})\"" }.join(",\n")}
+      ];
 
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">

data/app/views/leads/_contact.html.haml

@@ -14,6 +14,7 @@
         %td
           .label.top #{t :company}:
           = f.text_field :company
+          = autocomplete_text_field 'lead_company', Account.order(:name).map(&:name)
       %tr
         %td
           .label #{t :alt_email}:

data/app/views/leads/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_lead{ hidden }
 

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

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

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

@@ -35,20 +35,10 @@
       %table
         %tr
           %td
-            .label
-              #{t :account}
-              %span#account_create_title
-                (#{t :create_new} #{t :or} <a href='#' onclick='crm.select_account(1); return false;'>#{t :select_existing}</a>):
-              %span#account_select_title
-                (<a href='#' onclick='crm.create_account(1); return false;'>#{t :create_new}</a> #{t :or} #{t :select_existing}):
-              %span#account_disabled_title :
-
-            -# Add [-- None --] account choice when editing existing opportunity that has an account.
-            - options = { :selected => @account.id || 0 }
-            - options[:include_blank] = true #t(:select_none) unless @opportunity.new_record? || @opportunity.account.blank?
-            = account_select(options)
-            
-            = a.text_field :name, :style => "width:324px; display:none;"
+            != account_select_or_create(a) do |options|
+              -# Add [-- None --] account choice when editing existing opportunity that has an account.
+              - options[:selected] = @account.id || 0
+              - options[:include_blank] = true #t(:select_none) unless @opportunity.new_record? || @opportunity.account.blank?
           %td= spacer
           %td
             .label.req #{t :assigned_to}:

data/app/views/opportunities/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_opportunity{ hidden }
 

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

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

data/app/views/subscription_mailer/comment_notification.text.erb

@@ -0,0 +1,7 @@
+<%= I18n.t('comment_notification.intro', :user_full_name => @user.full_name, :entity_type => @entity_type, :entity_name => @entity_name) %>
+
+<%= @comment.comment.html_safe %>
+
+
+--
+<%= I18n.t('comment_notification.reply_instructions', :entity => @entity_type.downcase) %>: <%= polymorphic_url(@entity) %>

data/config/application.rb

@@ -24,7 +24,9 @@ module FatFreeCRM
                              Dir[Rails.root.join("app/controllers/entities")]
 
     # Activate observers that should always be running.
-    config.active_record.observers = :lead_observer, :opportunity_observer, :task_observer unless ARGV.join.include?('assets:precompile')
+    unless ARGV.join.include?('assets:precompile')
+      config.active_record.observers = :lead_observer, :opportunity_observer, :task_observer
+    end
 
     # Load development rake tasks (RSpec, Gem packaging, etc.)
     rake_tasks do

data/config/environments/development.rb

@@ -15,7 +15,7 @@ if defined?(FatFreeCRM::Application)
     config.action_controller.perform_caching = false
 
     # Don't care if the mailer can't send
-    config.action_mailer.raise_delivery_errors = false
+    config.action_mailer.raise_delivery_errors = true
 
     # Print deprecation notices to the Rails logger
     config.active_support.deprecation = :log

data/config/environments/test.rb

@@ -37,6 +37,9 @@ if defined?(FatFreeCRM::Application)
 
     # Print deprecation notices to the stderr
     config.active_support.deprecation = :stderr
+
+    # Set default host for mailer specs
+    config.action_mailer.default_url_options = { :host => "www.example.com" }
   end
 
   # Optionally load 'awesome_print' for debugging in development mode.

data/config/initializers/action_mailer.rb

@@ -1,9 +1,12 @@
-# Configure ActionMailer
+# Configure ActionMailer unless running tests
 
-# Set SMTP settings if present.
-if smtp_settings = Setting.smtp
-  Rails.application.config.action_mailer.delivery_method = :smtp
-  Rails.application.config.action_mailer.smtp_settings = smtp_settings
+unless Rails.env.test?
+  # Set SMTP settings if present.
+  smtp_settings = Setting.smtp || {}
+  if smtp_settings["address"].present?
+    Rails.application.config.action_mailer.delivery_method = :smtp
+    Rails.application.config.action_mailer.smtp_settings = smtp_settings
+  end
 end
 
 # Set default host for outgoing emails

data/config/initializers/cancan.rb

@@ -0,0 +1,151 @@
+require 'cancan'
+
+# Setup
+# =====
+#
+# Put this gist in Rails.root/config/initializers/cancan.rb
+# Add Squeel to Gemfile, see https://github.com/ernie/squeel
+#
+#     gem "squeel", "~> 0.9.3"
+#
+# Load Squeel hash and symbol extensions in squeel config initializer
+#
+#     Squeel.configure do |config|
+#       config.load_core_extensions :hash, :symbol
+#     end
+#
+# then you can write
+#
+#    can :manage, User, :permissions.outer => {:type.matches => 'Manage%'}}
+#
+# This should offer all the old MetaWhere capabilities,
+# and extra, also allows outer joins
+#
+# you might also be interested in https://gist.github.com/1012332
+# if you use MetaWhere
+
+# https://gist.github.com/1523940
+class String
+  include Squeel::Nodes::PredicateOperators
+end
+
+module Squeel
+  module Visitors
+    class PredicateVisitor < Visitor
+      def visit_String(o, parent)
+        Arel::Nodes::SqlLiteral.new(o)
+      end
+    end
+  end
+end
+
+module CanCan
+
+  module ModelAdapters
+    class ActiveRecordAdapter < AbstractAdapter
+
+      def self.override_condition_matching?(subject, name, value)
+        name.kind_of?(Squeel::Nodes::Predicate) if defined? Squeel
+      end
+
+      def self.matches_condition?(subject, name, value)
+        subject_value = subject.send(name.expr)
+        method_name = name.method_name.to_s
+        if method_name.ends_with? "_any"
+          value.any? { |v| squeel_match? subject_value, method_name.sub("_any", ""), v }
+        elsif method_name.ends_with? "_all"
+          value.all? { |v| squeel_match? subject_value, method_name.sub("_all", ""), v }
+        else
+          squeel_match? subject_value, name.method_name, value
+        end
+      end
+
+      def self.squeel_match?(subject_value, method, value)
+        case method.to_sym
+        when :eq      then subject_value == value
+        when :not_eq  then subject_value != value
+        when :in      then value.include?(subject_value)
+        when :not_in  then !value.include?(subject_value)
+        when :lt      then subject_value < value
+        when :lteq    then subject_value <= value
+        when :gt      then subject_value > value
+        when :gteq    then subject_value >= value
+        when :matches then subject_value =~ Regexp.new("^" + Regexp.escape(value).gsub("%", ".*") + "$", true)
+        when :does_not_match then !squeel_match?(subject_value, :matches, value)
+        else raise NotImplemented, "The #{method} Squeel condition is not supported."
+        end
+      end
+
+      # mostly let Squeel do the job in building the query
+      def conditions
+        if @rules.size == 1 && @rules.first.base_behavior
+          # Return the conditions directly if there's just one definition
+          @rules.first.conditions.dup
+        else
+          @rules.reverse.inject(false_sql) do |accumulator, rule|
+            conditions = rule.conditions.dup
+            if conditions.blank?
+              rule.base_behavior ? (accumulator | true_sql) : (accumulator & false_sql)
+            else
+              rule.base_behavior ? (accumulator | conditions) : (accumulator & -conditions)
+            end
+          end
+        end
+      end
+
+      private
+
+      # override to fix overwrites
+      # do not write existing hashes using empty hashes
+      def merge_joins(base, add)
+        add.each do |name, nested|
+          if base[name].is_a?(Hash) && nested.present?
+            merge_joins(base[name], nested)
+          elsif !base[name].is_a?(Hash) || nested.present?
+            base[name] = nested
+          end
+        end
+      end
+
+    end
+  end
+
+  class Rule
+    # allow Squeel
+    def matches_conditions_hash?(subject, conditions = @conditions)
+      if conditions.empty?
+        true
+      else
+        if model_adapter(subject).override_conditions_hash_matching? subject, conditions
+          model_adapter(subject).matches_conditions_hash? subject, conditions
+        else
+          conditions.all? do |name, value|
+            if model_adapter(subject).override_condition_matching? subject, name, value
+              model_adapter(subject).matches_condition? subject, name, value
+            else
+              method_name = case name
+              when Symbol                   then name
+              when Squeel::Nodes::Join      then name._name
+              when Squeel::Nodes::Predicate then name.expr
+              else raise name
+              end
+              attribute = subject.send(method_name)
+              if value.kind_of?(Hash)
+                if attribute.kind_of? Array
+                  attribute.any? { |element| matches_conditions_hash? element, value }
+                else
+                  !attribute.nil? && matches_conditions_hash?(attribute, value)
+                end
+              elsif value.kind_of?(Array) || value.kind_of?(Range)
+                value.include? attribute
+              else
+                attribute == value
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+end

data/config/initializers/constants.rb

@@ -0,0 +1 @@
+ENTITIES = %w(Account Campaign Contact Lead Opportunity).freeze

data/config/initializers/locale.rb

@@ -0,0 +1,20 @@
+# Fat Free CRM
+# Copyright (C) 2008-2011 by Michael Dvorkin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#------------------------------------------------------------------------------
+
+# Set default locale from Settings
+
+I18n.default_locale = Setting.locale

data/config/initializers/paper_trail.rb

@@ -1,11 +1,10 @@
 require 'paper_trail'
 
-Version.class_eval do
+Version.const_set :ASSETS, %w(all tasks campaigns leads accounts contacts opportunities comments emails)
+Version.const_set :EVENTS, %w(all_events create view update destroy)
+Version.const_set :DURATION, %w(one_hour one_day two_days one_week two_weeks one_month)
 
-  ASSETS   = %w(all tasks campaigns leads accounts contacts opportunities comments emails)
-  EVENTS   = %w(all_events create view update destroy)
-  DURATION = %w(one_hour one_day two_days one_week two_weeks one_month)
-  ENTITIES = %w(Account Campaign Contact Lead Opportunity)
+Version.class_eval do
 
   attr_accessible :related
   belongs_to :related, :polymorphic => true