fat_free_crm 0.11.3 → 0.11.4

data/app/views/tasks/edit.js.rjs

@@ -2,7 +2,7 @@ id = dom_id(@task)
 
 if params[:cancel].true?     # <----------------- Hide [Edit Task]
 
-  partial = (@task.assigned_to && @task.assigned_to != @current_user.id) ? "assigned" : "pending"
+  partial = (@task.assigned_to && @task.assigned_to != current_user.id) ? "assigned" : "pending"
   page[id].replace_html :partial => partial, :collection => [ @task ], :locals => { :bucket => @task.bucket }
 
 else # <----------------------------------------  Show [Edit Task] form.
@@ -10,7 +10,7 @@ else # <----------------------------------------  Show [Edit Task] form.
   page.call "crm.hide_form", :create_task         # Hide [Create Task] form if it's open.
   if @previous                                    # Hide open [Edit Lead] form if any.
     if @previous.is_a?(Task)
-      partial = (@previous.assigned_to && @previous.assigned_to != @current_user.id) ? "assigned" : "pending"
+      partial = (@previous.assigned_to && @previous.assigned_to != current_user.id) ? "assigned" : "pending"
       page[dom_id(@previous)].replace :partial => partial, :collection => [ @previous ], :locals => { :bucket => nil }
     else
       page.call "crm.flick", "task_#{@previous}", :remove
@@ -18,8 +18,6 @@ else # <----------------------------------------  Show [Edit Task] form.
   end
   page.call "crm.highlight_off", id               # Disable onMouseOver for the list item.
   page[id].replace_html :partial => "edit"        # Show [Edit Task] form.
-  page.call "crm.init_chosen_fields"
-  page.call "crm.date_select_popup", :task_calendar, :task_bucket, Setting.task_calendar_with_time
   page[:task_name].focus
 
 end

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

@@ -17,4 +17,4 @@
   - if @tasks.values.flatten.blank?
     = render "empty"
 
-#export= raw links_to_task_export(@view)
+#export= render "shared/export"

data/app/views/tasks/index.xls.builder

@@ -0,0 +1,47 @@
+xml.Worksheet 'ss:Name' => I18n.t(:tab_tasks) do
+  xml.Table do
+    unless @tasks.empty?
+      # Header.
+      xml.Row do
+        heads = %w{name
+                   due
+                   date_created
+                   date_updated
+                   completed
+                   user
+                   assigned_to
+                   category
+                   background_info}
+        
+        heads.each do |head|
+          xml.Cell do
+            xml.Data I18n.t(head),
+                     'ss:Type' => 'String'
+          end
+        end
+      end
+      
+      # Rows.
+      @tasks.map(&:second).flatten.each do |task|
+        xml.Row do
+          data = [task.name,
+                  I18n.t(task.computed_bucket),
+                  task.created_at,
+                  task.updated_at,
+                  task.completed_at,
+                  task.user.try(:name),
+                  task.assignee.try(:name),
+                  task.category,
+                  task.background_info]
+        
+          data.each do |value|
+            xml.Cell do
+              xml.Data value,
+                       'ss:Type' => "#{value.respond_to?(:abs) ? 'Number' : 'String'}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,9 +3,7 @@ page.call "crm.flip_form", :create_task
 
 unless params[:cancel].true?
   page[:create_task].replace_html :partial => "new"
-  page.call "crm.init_chosen_fields"
   page.call "crm.set_title", :create_task, t(:create_task)
-  page.call "crm.date_select_popup", :task_calendar, :task_bucket, Setting.task_calendar_with_time
 else
   page.call "crm.set_title", :create_task, (@view == "assigned" ? t(:assigned_tasks) : t(:tasks))
 end

data/app/views/tasks/update.js.rjs

@@ -15,7 +15,6 @@ if @task.errors.empty?
   end
 
 else # Errors
-  page.call "crm.date_select_popup", :task_calendar, :task_bucket, Setting.task_calendar_with_time
   page[id].visual_effect :shake, :duration => 0.25, :distance => 6
   page[:task_name].focus
   page[:task_submit].enable

data/app/views/user_mailer/assigned_entity_notification.html.haml

@@ -0,0 +1,3 @@
+:plain
+  Your colleague #{@assigner_name} has assigned the #{@entity_name} #{@entity_type} to you.
+  #{@entity_url}

data/app/views/users/_user.html.haml

@@ -1,6 +1,6 @@
-- if @user == @current_user && Setting.per_user_locale
+- if @user == current_user && Setting.per_user_locale
   %div#options(style="float:right")
-    #{t :profile_language}: #{link_to(language_for(@current_user), "#", :id => :locale)}
+    #{t :profile_language}: #{link_to(language_for(current_user), "#", :id => :locale)}
 
 %table(cellspacing="0" cellpadding="0")
   %tr

data/app/views/users/_user_report.html.haml

@@ -0,0 +1,6 @@
+%li{:id => dom_id(user_report)}
+  .title
+    %span#title
+      = user_report.full_name
+  %ul.list#opportunities
+    = render :partial => "opportunities/opportunity", :collection => user_report.assigned_opportunities.pipeline.order("opportunities.amount DESC")

data/app/views/users/opportunities_overview.html.haml

@@ -0,0 +1,16 @@
+= styles_for :opportunity
+
+#create_opportunity{ hidden }
+
+- if @users_with_opportunities.all.any? || @unassigned_opportunities.all.any?
+  %ul
+    = render :partial => "user_report", :collection => @users_with_opportunities
+    - if @unassigned_opportunities.all.any?
+      #unassigned
+        .title
+          %span#title
+            = t(:unassigned_opportunities)
+        %ul.list#opportunities
+          = render :partial => "opportunities/opportunity", :collection => @unassigned_opportunities
+- else
+  = t(:no_opportunities_found)

data/app/views/users/show.html.haml

@@ -1,9 +1,9 @@
 .title_tools
-  - if @user == @current_user || @current_user.admin?
+  - if @user == current_user || current_user.admin?
     = link_to_inline(:edit_profile, edit_user_path(@user), :text => t(:edit_profile)) + " | "
     = link_to_inline(:upload_avatar, avatar_user_path(@user), :text => t(:upload_picture)) + " | "
     = link_to_inline(:change_password, password_user_path(@user), :text => t(:change_password))
-.title#title= (@user == @current_user ? t(:my_profile) : t(:profile))
+.title#title= (@user == current_user ? t(:my_profile) : t(:profile))
 %div#edit_profile{ hidden }
 %div#upload_avatar{ hidden }
 %div#change_password{ hidden }
@@ -13,4 +13,3 @@
 = hook(:show_user_bottom, self)
 
 %iframe#uploading{ :name => "uploading", :style => "width:100px; height:10px; border:5px" }
-

data/app/views/users/update.js.rjs

@@ -1,7 +1,7 @@
 if @user.errors.empty?
   page.call "crm.flip_form", :edit_profile
   page.call "crm.set_title", :edit_profile, t(:my_profile)
-  page[:welcome_username].replace_html @user.name
+  page[:welcome_username].replace_html current_user.name
   page[:profile].replace_html :partial => "user"
 else  
   page[:edit_profile].replace_html :partial => "profile"

data/app/views/versions/_version.html.haml

@@ -1,32 +1,17 @@
 %li.highlight[version]
   .body
-    - item_name = t(version.item.class.name)
+    - item_type = version.item_type.underscore.humanize
     - if user = User.find_by_id(version.whodunnit)
       - user_name = user.name
     - else
       - user_name = t('version.anonymous')
     -# If translation doesn't exist, just print event message
     - if t('version.' + version.event, :default => 0) != 0
-      = t('version.' + version.event, :item => item_name, :by => user_name, :default => version.event)
+      = t('version.' + version.event, :item => item_type, :by => user_name, :default => version.event)
     - else
       = auto_link(version.event).html_safe
     %small= t('time_ago', time_ago_in_words(version.created_at))
     %tt
       - version.changeset.each do |attr_name, change|
-        - if attr_name =~ /^cf_/
-          - field = CustomField.where(:name => attr_name).first
-          - label = field.label
-          - first = field.render change.first
-          - second = field.render change.second
-        - else
-          - label = t(attr_name)
-          - first = change.first
-          - second = change.second
-        - if [first, second].any?(&:present?)
-          %br
-          - if first.blank? and second.present?
-            = t('version.set', :attr => label, :to => second)
-          - elsif first.present? and second.present?
-            = t('version.change', :attr => label, :from => first, :to => second)
-          - elsif first.present? and second.blank?
-            = t('version.unset', :attr => label, :from => first)
+        - label, first, second = parse_version(attr_name, change)
+        = render :partial => 'versions/version_item', :locals => {:label => label, :first => first, :second => second}

data/app/views/versions/_version_item.html.haml

@@ -0,0 +1,8 @@
+- if [first, second].any?(&:present?)
+  %br
+  - if first.blank? and second.present?
+    = t('version.set_html', :attr => label, :to => second)
+  - elsif first.present? and second.present?
+    = t('version.change_html', :attr => label, :from => first, :to => second)
+  - elsif first.present? and second.blank?
+    = t('version.unset_html', :attr => label, :from => first)

data/app/views/versions/_versions.html.haml

@@ -1,11 +1,11 @@
-- if Setting.paper_trail_ui_enabled
+%div#versions
+  - collapsed = session[:version_history].nil?
   %br
+  = subtitle(:version_history, collapsed, t(:versions))
+  %div
+    %div{ hidden_if(collapsed) }
+      .list
+        - versions = Version.history(object).paginate(:page => 1, :per_page => 10)
+        = render :partial => "versions/version", :collection => versions
 
-  .subtitle
-    = t(:versions)
-
-  .list#versions
-    - versions = Version.history(object).paginate(:page => 1, :per_page => 10)
-    = render :partial => "versions/version", :collection => versions
-
-  = will_paginate versions, :id => 'versions_pagination', :params => {:action => :versions}
+      = will_paginate versions, :id => 'versions_pagination', :params => {:action => :versions}

data/config/application.rb

@@ -20,12 +20,15 @@ module FatFreeCRM
     # -- all .rb files in that directory are automatically loaded.
 
     # Models are organized in sub-directories
-    config.autoload_paths += Dir[Rails.root.join("app/models/**")] +
+    config.autoload_paths += Dir[Rails.root.join("app/models/**")] +                                                                 
                              Dir[Rails.root.join("app/controllers/entities")]
+    
+    # Prevent Field class from being reloading more than once as this clears registered customfields
+    config.autoload_once_paths += [File.expand_path("../app/models/fields/field.rb", __FILE__)]
 
     # Activate observers that should always be running.
     unless ARGV.join.include?('assets:precompile')
-      config.active_record.observers = :lead_observer, :opportunity_observer, :task_observer
+      config.active_record.observers = :lead_observer, :opportunity_observer, :task_observer, :entity_observer
     end
 
     # Load development rake tasks (RSpec, Gem packaging, etc.)
@@ -33,6 +36,11 @@ module FatFreeCRM
       Dir.glob(Rails.root.join('lib', 'development_tasks', '*.rake')).each {|t| load t }
     end
 
+    # Add migrations from all engines
+    Railties.engines.each do |engine|
+      config.paths['db/migrate'] += engine.paths['db/migrate'].existent
+    end
+
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
     # config.plugins = [ :exception_notification, :ssl_requirement, :all ]

data/config/deploy.example.rb

@@ -0,0 +1,47 @@
+$:.unshift File.expand_path('./lib', ENV['rvm_path'])
+
+require 'rvm/capistrano'
+require 'bundler/capistrano'
+load    'deploy/assets'
+
+set :application,     'fat_free_crm'
+set :repository,      'git://github.com/fatfreecrm/fat_free_crm.git'
+set :branch,          'master'
+set :scm,             :git
+set :deploy_to,       ''
+set :user,            ''
+set :use_sudo,        false
+set :rvm_type,        :user
+set :rvm_ruby_string, '1.9.3'
+server                '', :app, :web, :db, primary: true
+
+# Use local key instead of key installed on the server.
+# If not working run "ssh-add ~/.ssh/id_rsa" on your local machine.
+ssh_options[:forward_agent] = true
+
+namespace :deploy do
+  task :start, roles: :app do
+    run "touch #{current_release}/tmp/restart.txt"
+  end
+  
+  task :stop, roles: :app do
+    # Do nothing.
+  end
+  
+  desc 'Tell Passenger to restart the app.'
+  task :restart, roles: :app, except: { no_release: true } do
+    run "touch #{current_release}/tmp/restart.txt"
+    run "cd #{current_release} && passenger stop -p 3001"
+    run "cd #{current_release} && passenger start -a 127.0.0.1 -p 3001 -d -e production"
+  end
+  
+  desc 'Symlink shared configs and folders on each release.'
+  task :symlink_shared do
+    run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml"
+    run "ln -nfs #{shared_path}/config/settings.yml #{release_path}/config/settings.yml"
+    run "rm -rf #{release_path}/vendor/ruby"
+    run "ln -nfs #{shared_path}/bundle/ruby #{release_path}/vendor/ruby"
+  end
+end
+
+after 'deploy:finalize_update', 'deploy:symlink_shared'

data/config/environments/development.rb

@@ -35,5 +35,6 @@ if defined?(FatFreeCRM::Application)
 
     # Expands the lines which load the assets
     config.assets.debug = true
+
   end
 end

data/config/environments/production.rb

@@ -46,9 +46,7 @@ if defined?(FatFreeCRM::Application)
 
     # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
     # config.assets.precompile += %w( search.js )
-    config.assets.precompile += ['print.css',
-                                 'calendar_date_select/default.css',
-                                 /calendar_date_select\/[^\/]*\.js/]
+    config.assets.precompile += ['print.css', 'jquery_ui_datepicker/*.js']
 
     # Enable threaded mode
     # config.threadsafe!

data/config/environments/staging.rb

@@ -11,4 +11,4 @@ if defined?(FatFreeCRM::Application)
     # Full error reports
     config.consider_all_requests_local = true
   end
-end
+end

data/config/initializers/action_mailer.rb

@@ -1,15 +1,17 @@
+#
 # Configure ActionMailer unless running tests
-
+#   ActionMailer is setup in test mode later on
+#
 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
+    Rails.application.config.action_mailer.smtp_settings = smtp_settings.symbolize_keys
+  end
+
+  if (host = Setting.host).present?
+    (Rails.application.routes.default_url_options ||= {})[:host] = host.gsub('http://', '')
   end
-end
 
-# Set default host for outgoing emails
-if Setting.host.present?
-  (Rails.application.config.action_mailer.default_url_options ||= {})[:host] = Setting.host
 end

data/config/initializers/custom_fields.rb

@@ -0,0 +1,21 @@
+# 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/>.
+#------------------------------------------------------------------------------
+
+# Custom fields need to be loaded so they register their availability
+#------------------------------------------------------------------------------
+custom_field_path = File.join(File.dirname(__FILE__), '..', '..', 'app', 'models', 'fields', 'custom_field_*')
+Dir[custom_field_path].each {|f| require f}

data/config/initializers/gravatar.rb

@@ -0,0 +1,7 @@
+GravatarImageTag.configure do |config|
+  config.default_image = :mm   # Set this to use your own default gravatar image rather then serving up Gravatar's default image [ 'http://example.com/images/default_gravitar.jpg', :identicon, :monsterid, :wavatar, 404 ].
+  config.filetype      = nil   # Set this if you require a specific image file format ['gif', 'jpg' or 'png'].  Gravatar's default is png
+  config.rating        = nil   # Set this if you change the rating of the images that will be returned ['G', 'PG', 'R', 'X']. Gravatar's default is G
+  config.size          = nil   # Set this to globally set the size of the gravatar image returned (1..512). Gravatar's default is 80
+  config.secure        = false # Set this to true if you require secure images on your pages.
+end

data/config/initializers/paper_trail.rb

@@ -44,6 +44,7 @@ Version.class_eval do
       where(({:event     => options[:event]} if options[:event])).
       where(({:whodunnit => options[:user].to_s}  if options[:user])).
       where('versions.created_at >= ?', Time.zone.now - (options[:duration] || 2.days)).
+      limit(options[:max]).
       default_order
     end
 

data/config/initializers/ransack.rb

@@ -0,0 +1,15 @@
+Ransack.configure do |config|
+  config.default_predicates = {
+    :compounds => true,
+    :only => [
+      :cont, :not_cont, :blank, :present, :true, :false, :eq, :not_eq,
+      :lt, :gt, :null, :not_null, :matches, :does_not_match
+    ]
+  }
+
+  config.ajax_options = {
+    :url  => '/:controller/auto_complete.json',
+    :type => 'POST',
+    :key  => 'auto_complete_query'
+  }
+end

data/config/initializers/simple_form.rb

@@ -52,7 +52,7 @@ SimpleForm.setup do |config|
   # config.collection_value_methods = [ :id, :to_s ]
 
   # How the label text should be generated altogether with the required text.
-  # config.label_text = lambda { |label, required| "#{required} #{label}" }
+  config.label_text = lambda { |label, required| "#{label}" }
 
   # You can define the class to use on all labels. Default is nil.
   # config.label_class = nil
@@ -93,4 +93,3 @@ SimpleForm.setup do |config|
   # When false, do not use translations for labels, hints or placeholders.
   # config.translate = true
 end
-