fat_free_crm 0.11.1 → 0.11.2

data/app/controllers/home_controller.rb

@@ -26,16 +26,7 @@ class HomeController < ApplicationController
     hook(:home_controller, self, :params => "it works!")
 
     @activities = get_activities
-    respond_to do |format|
-      format.html # index.html.haml
-      format.js   # index.js.rjs
-      format.json { render :json => @activities }
-      format.xml  { render :xml => @activities }
-      format.xls  { send_data @activities.to_xls, :type => :xls }
-      format.csv  { send_data @activities.to_csv, :type => :csv }
-      format.rss  { render "index.rss.builder" }
-      format.atom { render "index.atom.builder" }
-    end
+    respond_with(@activities)
   end
 
   # GET /home/options                                                      AJAX

data/app/controllers/lists_controller.rb

@@ -16,7 +16,6 @@
 #------------------------------------------------------------------------------
 
 class ListsController < ApplicationController
-  respond_to :js
 
   # POST /lists
   #----------------------------------------------------------------------------
@@ -27,6 +26,7 @@ class ListsController < ApplicationController
     else
       @list = List.create(params[:list])
     end
+
     respond_with(@list)
   end
 
@@ -37,8 +37,5 @@ class ListsController < ApplicationController
     @list.destroy
 
     respond_with(@list)
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:html, :js, :json, :xml)
   end
 end

data/app/controllers/{entities/tasks_controller.rb → tasks_controller.rb}

@@ -15,30 +15,26 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #------------------------------------------------------------------------------
 
-class TasksController < EntitiesController
-  before_filter :auto_complete, :only => :auto_complete
+class TasksController < ApplicationController
+  before_filter :require_user
+  before_filter :set_current_tab, :only => [ :index, :show ]
   before_filter :update_sidebar, :only => :index
-  skip_after_filter :update_recently_viewed
 
   # GET /tasks
   #----------------------------------------------------------------------------
   def index
     @view = params[:view] || "pending"
     @tasks = Task.find_all_grouped(@current_user, @view)
+
     respond_with(@tasks)
   end
 
   # GET /tasks/1
   #----------------------------------------------------------------------------
   def show
-    respond_to do |format|
-      format.html { render :index }
-      format.json { @task = Task.tracked_by(@current_user).find(params[:id]);  render :json => @task }
-      format.xml  { @task = Task.tracked_by(@current_user).find(params[:id]);  render :xml => @task }
-    end
+    @task = Task.tracked_by(@current_user).find(params[:id])
 
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:js, :json, :xml)
+    respond_with(@task)
   end
 
   # GET /tasks/new
@@ -49,14 +45,17 @@ class TasksController < EntitiesController
     @users = User.except(@current_user).by_name
     @bucket = Setting.unroll(:task_bucket)[1..-1] << [ t(:due_specific_date, :default => 'On Specific Date...'), :specific_time ]
     @category = Setting.unroll(:task_category)
+
     if params[:related]
-      model, id = params[:related].split("_")
-      instance_variable_set("@asset", model.classify.constantize.my.find(id))
+      model, id = params[:related].split('_')
+      if related = model.classify.constantize.my.find_by_id(id)
+        instance_variable_set("@asset", related)
+      else
+        respond_to_related_not_found(model) and return
+      end
     end
-    respond_with(@task)
 
-  rescue ActiveRecord::RecordNotFound # Kicks in if related asset was not found.
-    respond_to_related_not_found(model, :js) if model
+    respond_with(@task)
   end
 
   # GET /tasks/1/edit                                                      AJAX
@@ -68,14 +67,12 @@ class TasksController < EntitiesController
     @bucket = Setting.unroll(:task_bucket)[1..-1] << [ t(:due_specific_date, :default => 'On Specific Date...'), :specific_time ]
     @category = Setting.unroll(:task_category)
     @asset = @task.asset if @task.asset_id?
+
     if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Task.tracked_by(@current_user).find($1)
+      @previous = Task.tracked_by(@current_user).find_by_id($1) || $1.to_i
     end
-    respond_with(@task)
 
-  rescue ActiveRecord::RecordNotFound
-    @previous ||= $1.to_i
-    respond_to_not_found(:js) unless @task
+    respond_with(@task)
   end
 
   # POST /tasks
@@ -115,9 +112,6 @@ class TasksController < EntitiesController
         end
       end
     end
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:js, :json, :xml)
   end
 
   # DELETE /tasks/1
@@ -125,7 +119,7 @@ class TasksController < EntitiesController
   def destroy
     @view = params[:view] || "pending"
     @task = Task.tracked_by(@current_user).find(params[:id])
-    @task.destroy if @task
+    @task.destroy
 
     # Make sure bucket's div gets hidden if we're deleting last task in the bucket.
     if Task.bucket_empty?(params[:bucket], @current_user, @view)
@@ -134,9 +128,6 @@ class TasksController < EntitiesController
 
     update_sidebar if called_from_index_page?
     respond_with(@task)
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:js, :json, :xml)
   end
 
   # PUT /tasks/1/complete
@@ -152,14 +143,11 @@ class TasksController < EntitiesController
 
     update_sidebar unless params[:bucket].blank?
     respond_with(@task)
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:js, :json, :xml)
   end
 
   # POST /tasks/auto_complete/query                                        AJAX
   #----------------------------------------------------------------------------
-  # Handled by before_filter :auto_complete, :only => :auto_complete
+  # Handled by ApplicationController :auto_complete
 
   # Ajax request to filter out a list of tasks.                            AJAX
   #----------------------------------------------------------------------------
@@ -175,7 +163,8 @@ class TasksController < EntitiesController
     end
   end
 
-  private
+private
+
   # Yields array of current filters and updates the session using new values.
   #----------------------------------------------------------------------------
   def update_session

data/app/controllers/users_controller.rb

@@ -23,9 +23,9 @@ class UsersController < ApplicationController
   before_filter :require_and_assign_user, :except => [ :new, :create, :show, :avatar, :upload_avatar ]
   before_filter :assign_given_or_current_user, :only => [ :show, :avatar, :upload_avatar ]
 
+  load_resource
+
   respond_to :html, :only => [ :show, :new ]
-  respond_to :js
-  respond_to :json, :xml, :except => :edit
 
   # GET /users/1
   # GET /users/1.json
@@ -41,7 +41,6 @@ class UsersController < ApplicationController
   #----------------------------------------------------------------------------
   def new
     if can_signup?
-      @user = User.new
       respond_with(@user)
     else
       redirect_to login_path
@@ -58,7 +57,6 @@ class UsersController < ApplicationController
   # POST /users.xml                                                        HTML
   #----------------------------------------------------------------------------
   def create
-    @user = User.new(params[:user])
     if @user.save
       if Setting.user_signup == :needs_approval
         flash[:notice] = t(:msg_account_created)
@@ -78,6 +76,7 @@ class UsersController < ApplicationController
   #----------------------------------------------------------------------------
   def update
     @user.update_attributes(params[:user])
+
     respond_with(@user)
   end
 
@@ -140,6 +139,7 @@ class UsersController < ApplicationController
     else
       @user.errors.add(:current_password, t(:msg_invalid_password))
     end
+
     respond_with(@user)
   end
 
@@ -150,7 +150,8 @@ class UsersController < ApplicationController
     render(:update) { |page| page.redirect_to user_path(@current_user) }
   end
 
-  private
+private
+
   #----------------------------------------------------------------------------
   def require_and_assign_user
     require_user

data/app/helpers/accounts_helper.rb

@@ -20,7 +20,7 @@ module AccountsHelper
   # Sidebar checkbox control for filtering accounts by category.
   #----------------------------------------------------------------------------
   def account_category_checbox(category, count)
-    checked = (session[:filter_by_account_category] ? session[:filter_by_account_category].split(",").include?(category.to_s) : count.to_i > 0)
+    checked = (session[:accounts_filter] ? session[:accounts_filter].split(",").include?(category.to_s) : count.to_i > 0)
     onclick = remote_function(
       :url      => { :action => :filter },
       :with     => h(%Q/"category=" + $$("input[name='category[]']").findAll(function (el) { return el.checked }).pluck("value")/),
@@ -42,13 +42,36 @@ module AccountsHelper
   end
   
   def account_select(options = {})
-    # Generates a select list with the first 25 accounts,
-    # and prepends the currently selected account, if available
-    options[:selected] = (@account && @account.id) || 0
-    accounts = ([@account] + Account.order("name").my.limit(25)).compact.uniq
-    collection_select :account, :id, accounts, :id, :name, options,
-                      {:"data-placeholder" => t(:select_an_account),
-                       :style => "width:330px; display:none;" }
+      # Generates a select list with the first 25 accounts,
+      # and prepends the currently selected account, if available
+      options[:selected] = (@account && @account.id) || 0
+      accounts = ([@account] + Account.my.order(:name).limit(25)).compact.uniq
+      collection_select :account, :id, accounts, :id, :name, options,
+                        {:"data-placeholder" => t(:select_an_account),
+                         :style => "width:330px; display:none;" }
+  end
+  
+  # Select an existing account or create a new one.
+  #----------------------------------------------------------------------------
+  def account_select_or_create(form, &block)
+    options = {}
+    yield options if block_given?
+    
+    content_tag(:div, :class => 'label') do
+      t(:account).html_safe +
+    
+      content_tag(:span, :id => 'account_create_title') do
+        "(#{t :create_new} #{t :or} <a href='#' onclick='crm.select_account(1); return false;'>#{t :select_existing}</a>):".html_safe
+      end.html_safe +
+    
+      content_tag(:span, :id => 'account_select_title') do
+        "(<a href='#' onclick='crm.create_account(1); return false;'>#{t :create_new}</a> #{t :or} #{t :select_existing}):".html_safe
+      end.html_safe +
+    
+      content_tag(:span, ':', :id => 'account_disabled_title').html_safe
+    end.html_safe +
+    
+    account_select(options).html_safe +
+    form.text_field(:name, :style => 'width:324px; display:none;')
   end
 end
-

data/app/helpers/application_helper.rb

@@ -332,7 +332,12 @@ module ApplicationHelper
 
   #----------------------------------------------------------------------------
   def default_avatar_url
-    request.protocol + request.host_with_port + image_path('avatar.jpg')
+    url = image_path('avatar.jpg')
+    if ActionController::Base.config.asset_host.present?
+      url
+    else
+      request.protocol + request.host_with_port + url
+    end
   end
 
   # Returns default permissions intro.
@@ -417,5 +422,14 @@ module ApplicationHelper
   def link_to_remove_fields(name, f)
     link_to image_tag('delete.png', :size => '16x16', :alt => name), nil, :class => "remove_fields"
   end
+  
+  # Adds autocomplete functionality to an existing text field.
+  #----------------------------------------------------------------------------
+  def autocomplete_text_field(id, values)
+    javascript_tag %Q{
+      var textField = jQuery('##{id}');
+      textField.autocomplete({ source: #{values} });
+    }
+  end
 end
 

data/app/helpers/campaigns_helper.rb

@@ -20,7 +20,7 @@ module CampaignsHelper
   # Sidebar checkbox control for filtering campaigns by status.
   #----------------------------------------------------------------------------
   def campaign_status_checbox(status, count)
-    checked = (session[:filter_by_campaign_status] ? session[:filter_by_campaign_status].split(",").include?(status.to_s) : count.to_i > 0)
+    checked = (session[:campaigns_filter] ? session[:campaigns_filter].split(",").include?(status.to_s) : count.to_i > 0)
     onclick = remote_function(
       :url      => { :action => :filter },
       :with     => h(%Q/"status=" + $$("input[name='status[]']").findAll(function (el) { return el.checked }).pluck("value")/),

data/app/helpers/comments_helper.rb

@@ -16,5 +16,15 @@
 #------------------------------------------------------------------------------
 
 module CommentsHelper
-end
 
+  # Generates a list of links for the subscribed users
+  def subscribed_user_links(users)
+    links = users.map {|user| link_to(user.full_name, user_path(user)) }
+    links.join(", ").html_safe
+  end
+
+  def notification_emails_configured?
+    config = Setting.email_comment_replies || {}
+    config[:server].present? && config[:user].present? && config[:password].present?
+  end
+end

data/app/helpers/leads_helper.rb

@@ -53,7 +53,7 @@ module LeadsHelper
   # Sidebar checkbox control for filtering leads by status.
   #----------------------------------------------------------------------------
   def lead_status_checbox(status, count)
-    checked = (session[:filter_by_lead_status] ? session[:filter_by_lead_status].split(",").include?(status.to_s) : count.to_i > 0)
+    checked = (session[:leads_filter] ? session[:leads_filter].split(",").include?(status.to_s) : count.to_i > 0)
     onclick = remote_function(
       :url      => { :action => :filter },
       :with     => h(%Q/"status=" + $$("input[name='status[]']").findAll(function (el) { return el.checked }).pluck("value")/),

data/app/helpers/opportunities_helper.rb

@@ -20,7 +20,7 @@ module OpportunitiesHelper
   # Sidebar checkbox control for filtering opportunities by stage.
   #----------------------------------------------------------------------------
   def opportunity_stage_checbox(stage, count)
-    checked = (session[:filter_by_opportunity_stage] ? session[:filter_by_opportunity_stage].split(",").include?(stage.to_s) : count.to_i > 0)
+    checked = (session[:opportunities_filter] ? session[:opportunities_filter].split(",").include?(stage.to_s) : count.to_i > 0)
     onclick = remote_function(
       :url      => { :action => :filter },
       :with     => h(%Q/"stage=" + $$("input[name='stage[]']").findAll(function (el) { return el.checked }).pluck("value")/),

data/app/{models/mailers/notifier.rb → mailers/dropbox_mailer.rb}

@@ -15,30 +15,19 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #------------------------------------------------------------------------------
 
-class Notifier < ActionMailer::Base
+class DropboxMailer < ActionMailer::Base
 
-  #----------------------------------------------------------------------------
-  def password_reset_instructions(user)
-    @edit_password_url = edit_password_url(user.perishable_token)
-
-    mail(:subject => "Fat Free CRM: " + I18n.t(:password_reset_instruction),
-         :to => user.email,
-         :from => "Fat Free CRM <noreply@fatfreecrm.com>",
-         :date => Time.now)
-  end
-
-  #----------------------------------------------------------------------------
-  def dropbox_ack_notification(user, from, email, mediator_links)
+  def dropbox_notification(user, from, email, mediator_links)
     I18n.locale = Setting.locale
     @mediator_links = mediator_links.join("\n")
     @subject        = email.subject
     @body           = email.body_plain
 
-    mail(:subject => I18n.t(:dropbox_ack_subject, :subject => email.subject),
+    mail :subject => I18n.t(:dropbox_notification_subject, :subject => email.subject),
          :to => user.email,
          :from => from,
-         :date => Time.now)
+         :date => Time.now
   end
-
+  
 end
 

data/app/mailers/subscription_mailer.rb

@@ -0,0 +1,37 @@
+# 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/>.
+#------------------------------------------------------------------------------
+
+class SubscriptionMailer < ActionMailer::Base
+
+  def comment_notification(user, comment)
+    @entity = comment.commentable
+    @entity_type = @entity.class.to_s
+    @entity_name = @entity.respond_to?(:full_name) ? @entity.full_name : @entity.name
+
+    @comment = comment
+    @user = comment.user
+
+    # If entity has tags, join them and wrap in parantheses
+    subject = "RE: [#{@entity_type.downcase}:#{@entity.id}] #{@entity_name}"
+    subject << " (#{@entity.tag_list.join(', ')})" if @entity.tag_list.any?
+
+    mail :subject => subject,
+         :to => user.email,
+         :from => "#{@user.full_name} <#{Setting.email_comment_replies[:address]}>",
+         :date => Time.now
+  end
+end

data/{lib/tasks/dropbox.rake → app/mailers/user_mailer.rb}

@@ -15,18 +15,16 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #------------------------------------------------------------------------------
 
-namespace :ffcrm do
-  namespace :dropbox do
-    desc "Run dropbox crawler and process incoming emails"
-    task :run => :environment do
-      crawler = FatFreeCRM::Dropbox.new
-      crawler.run
-    end
-    
-    desc "Set up email dropbox based on currently loaded settings"
-    task :setup => :environment do
-      crawler = FatFreeCRM::Dropbox.new
-      crawler.setup
-    end
+class UserMailer < ActionMailer::Base
+
+  def password_reset_instructions(user)
+    @edit_password_url = edit_password_url(user.perishable_token)
+
+    mail :subject => "Fat Free CRM: " + I18n.t(:password_reset_instruction),
+         :to => user.email,
+         :from => "Fat Free CRM <noreply@fatfreecrm.com>",
+         :date => Time.now
   end
+
 end
+