fat_free_crm 0.11.3 → 0.11.4

data/app/controllers/entities/campaigns_controller.rb

@@ -21,11 +21,20 @@ class CampaignsController < EntitiesController
   # GET /campaigns
   #----------------------------------------------------------------------------
   def index
-    @campaigns = get_campaigns(:page => params[:page])
-    respond_with(@campaigns)
+    @campaigns = get_campaigns(:page => params[:page], :per_page => params[:per_page])
+
+    respond_with @campaigns do |format|
+      format.xls { render :layout => 'header' }
+    end
   end
 
   # GET /campaigns/1
+  # AJAX /campaigns/1
+  # XLS /campaigns/1
+  # XLS /campaigns/1
+  # CSV /campaigns/1
+  # RSS /campaigns/1
+  # ATOM /campaigns/1
   #----------------------------------------------------------------------------
   def show
     respond_with(@campaign) do |format|
@@ -34,6 +43,31 @@ class CampaignsController < EntitiesController
         @comment = Comment.new
         @timeline = timeline(@campaign)
       end
+      
+      format.js do
+        @stage = Setting.unroll(:opportunity_stage)
+        @comment = Comment.new
+        @timeline = timeline(@campaign)
+      end
+
+      format.xls do
+        @leads = @campaign.leads
+        render '/leads/index', :layout => 'header'
+      end
+
+      format.csv do
+        render :csv => @campaign.leads
+      end
+
+      format.rss do
+        @items  = "leads"
+        @assets = @campaign.leads
+      end
+
+      format.atom do
+        @items  = "leads"
+        @assets = @campaign.leads
+      end
     end
   end
 
@@ -42,8 +76,7 @@ class CampaignsController < EntitiesController
   # GET /campaigns/new.xml                                                 AJAX
   #----------------------------------------------------------------------------
   def new
-    @campaign.attributes = {:user => @current_user, :access => Setting.default_access}
-    @users = User.except(@current_user)
+    @campaign.attributes = {:user => current_user, :access => Setting.default_access, :assigned_to => nil}
 
     if params[:related]
       model, id = params[:related].split('_')
@@ -60,7 +93,6 @@ class CampaignsController < EntitiesController
   # GET /campaigns/1/edit                                                  AJAX
   #----------------------------------------------------------------------------
   def edit
-    @users = User.except(@current_user)
     if params[:previous].to_s =~ /(\d+)\z/
       @previous = Campaign.my.find_by_id($1) || $1.to_i
     end
@@ -71,10 +103,11 @@ class CampaignsController < EntitiesController
   # POST /campaigns
   #----------------------------------------------------------------------------
   def create
-    @users = User.except(@current_user)
+    @comment_body = params[:comment_body]
 
     respond_with(@campaign) do |format|
-      if @campaign.save_with_permissions(params[:users])
+      if @campaign.save
+        @campaign.add_comment_by_user(@comment_body, current_user)
         @campaigns = get_campaigns
         get_data_for_sidebar
       end
@@ -85,11 +118,9 @@ class CampaignsController < EntitiesController
   #----------------------------------------------------------------------------
   def update
     respond_with(@campaign) do |format|
-      if @campaign.update_with_permissions(params[:campaign], params[:users])
-        get_data_for_sidebar if called_from_index_page?
-      else
-        @users = User.except(@current_user) # Need it to redraw [Edit Campaign] form.
-      end
+      # Must set access before user_ids, because user_ids= method depends on access value.
+      @campaign.access = params[:campaign][:access] if params[:campaign][:access]
+      get_data_for_sidebar if @campaign.update_attributes(params[:campaign]) and called_from_index_page?
     end
   end
 
@@ -116,32 +147,28 @@ class CampaignsController < EntitiesController
   #----------------------------------------------------------------------------
   # Handled by ApplicationController :auto_complete
 
-  # GET /campaigns/options                                                 AJAX
-  #----------------------------------------------------------------------------
-  def options
-    unless params[:cancel].true?
-      @per_page = @current_user.pref[:campaigns_per_page] || Campaign.per_page
-      @outline  = @current_user.pref[:campaigns_outline]  || Campaign.outline
-      @sort_by  = @current_user.pref[:campaigns_sort_by]  || Campaign.sort_by
-    end
-  end
-
   # POST /campaigns/redraw                                                 AJAX
   #----------------------------------------------------------------------------
   def redraw
-    @current_user.pref[:campaigns_per_page] = params[:per_page] if params[:per_page]
-    @current_user.pref[:campaigns_outline]  = params[:outline]  if params[:outline]
-    @current_user.pref[:campaigns_sort_by]  = Campaign::sort_by_map[params[:sort_by]] if params[:sort_by]
-    @campaigns = get_campaigns(:page => 1)
-    render :index
+    current_user.pref[:campaigns_per_page] = params[:per_page] if params[:per_page]
+    current_user.pref[:campaigns_sort_by]  = Campaign::sort_by_map[params[:sort_by]] if params[:sort_by]
+    @campaigns = get_campaigns(:page => 1, :per_page => params[:per_page])
+    set_options # Refresh options
+    
+    respond_with(@campaigns) do |format|
+      format.js { render :index }
+    end
   end
 
   # POST /campaigns/filter                                                 AJAX
   #----------------------------------------------------------------------------
   def filter
     session[:campaigns_filter] = params[:status]
-    @campaigns = get_campaigns(:page => 1)
-    render :index
+    @campaigns = get_campaigns(:page => 1, :per_page => params[:per_page])
+    
+    respond_with(@campaigns) do |format|
+      format.js { render :index }
+    end
   end
 
 private

data/app/controllers/entities/contacts_controller.rb

@@ -16,32 +16,32 @@
 #------------------------------------------------------------------------------
 
 class ContactsController < EntitiesController
-  before_filter :get_users, :only => [ :new, :create, :edit, :update ]
   before_filter :get_accounts, :only => [ :new, :create, :edit, :update ]
 
   # GET /contacts
   #----------------------------------------------------------------------------
   def index
-    @contacts = get_contacts(:page => params[:page])
-    respond_with(@contacts)
+    @contacts = get_contacts(:page => params[:page], :per_page => params[:per_page])
+
+    respond_with @contacts do |format|
+      format.xls { render :layout => 'header' }
+    end
   end
 
   # GET /contacts/1
+  # AJAX /contacts/1
   #----------------------------------------------------------------------------
   def show
-    respond_with(@contact) do |format|
-      format.html do
-        @stage = Setting.unroll(:opportunity_stage)
-        @comment = Comment.new
-        @timeline = timeline(@contact)
-      end
-    end
+    @stage = Setting.unroll(:opportunity_stage)
+    @comment = Comment.new
+    @timeline = timeline(@contact)
+    respond_with(@contact)
   end
 
   # GET /contacts/new
   #----------------------------------------------------------------------------
   def new
-    @contact.attributes = {:user => current_user, :access => Setting.default_access}
+    @contact.attributes = {:user => current_user, :access => Setting.default_access, :assigned_to => nil}
     @account = Account.new(:user => current_user)
 
     if params[:related]
@@ -70,8 +70,10 @@ class ContactsController < EntitiesController
   # POST /contacts
   #----------------------------------------------------------------------------
   def create
+    @comment_body = params[:comment_body]
     respond_with(@contact) do |format|
       if @contact.save_with_account_and_permissions(params)
+        @contact.add_comment_by_user(@comment_body, current_user)
         @contacts = get_contacts if called_from_index_page?
       else
         unless params[:account][:id].blank?
@@ -93,7 +95,6 @@ class ContactsController < EntitiesController
   def update
     respond_with(@contact) do |format|
       unless @contact.update_with_account_and_permissions(params)
-        @users = User.except(current_user)
         if @contact.account
           @account = Account.find(@contact.account.id)
         else
@@ -126,22 +127,10 @@ class ContactsController < EntitiesController
   #----------------------------------------------------------------------------
   # Handled by ApplicationController :auto_complete
 
-  # GET /contacts/options                                                  AJAX
-  #----------------------------------------------------------------------------
-  def options
-    unless params[:cancel].true?
-      @per_page = current_user.pref[:contacts_per_page] || Contact.per_page
-      @outline  = current_user.pref[:contacts_outline]  || Contact.outline
-      @sort_by  = current_user.pref[:contacts_sort_by]  || Contact.sort_by
-      @naming   = current_user.pref[:contacts_naming]   || Contact.first_name_position
-    end
-  end
-
   # POST /contacts/redraw                                                  AJAX
   #----------------------------------------------------------------------------
   def redraw
     current_user.pref[:contacts_per_page] = params[:per_page] if params[:per_page]
-    current_user.pref[:contacts_outline]  = params[:outline]  if params[:outline]
 
     # Sorting and naming only: set the same option for Leads if the hasn't been set yet.
     if params[:sort_by]
@@ -155,8 +144,12 @@ class ContactsController < EntitiesController
       current_user.pref[:leads_naming] ||= params[:naming]
     end
 
-    @contacts = get_contacts(:page => 1) # Start one the first page.
-    render :index
+    @contacts = get_contacts(:page => 1, :per_page => params[:per_page]) # Start on the first page.
+    set_options # Refresh options
+    
+    respond_with(@contacts) do |format|
+      format.js { render :index }
+    end
   end
 
   private
@@ -168,6 +161,11 @@ class ContactsController < EntitiesController
     @accounts = Account.my.order('name')
   end
 
+  def set_options
+    super
+    @naming = (current_user.pref[:contacts_naming]   || Contact.first_name_position) unless params[:cancel].true?
+  end
+
   #----------------------------------------------------------------------------
   def respond_to_destroy(method)
     if method == :ajax

data/app/controllers/entities/leads_controller.rb

@@ -17,30 +17,31 @@
 
 class LeadsController < EntitiesController
   before_filter :get_data_for_sidebar, :only => :index
+  autocomplete :account, :name, :full => true
 
   # GET /leads
   #----------------------------------------------------------------------------
   def index
     @leads = get_leads(:page => params[:page])
-    respond_with(@leads)
+
+    respond_with @leads do |format|
+       format.xls { render :layout => 'header' }
+    end
   end
 
   # GET /leads/1
+  # AJAX /leads/1
   #----------------------------------------------------------------------------
   def show
-    respond_with(@lead) do |format|
-      format.html do
-        @comment = Comment.new
-        @timeline = timeline(@lead)
-      end
-    end
+    @comment = Comment.new
+    @timeline = timeline(@lead)
+    respond_with(@lead)
   end
 
   # GET /leads/new
   #----------------------------------------------------------------------------
   def new
-    @lead.attributes = {:user => @current_user, :access => Setting.default_access}
-    @users = User.except(@current_user)
+    @lead.attributes = {:user => current_user, :access => Setting.default_access, :assigned_to => nil}
     get_campaigns
 
     if params[:related]
@@ -58,7 +59,6 @@ class LeadsController < EntitiesController
   # GET /leads/1/edit                                                      AJAX
   #----------------------------------------------------------------------------
   def edit
-    @users = User.except(@current_user)
     get_campaigns
 
     if params[:previous].to_s =~ /(\d+)\z/
@@ -71,11 +71,12 @@ class LeadsController < EntitiesController
   # POST /leads
   #----------------------------------------------------------------------------
   def create
-    @users = User.except(@current_user)
     get_campaigns
+    @comment_body = params[:comment_body]
 
     respond_with(@lead) do |format|
       if @lead.save_with_permissions(params)
+        @lead.add_comment_by_user(@comment_body, current_user)
         if called_from_index_page?
           @leads = get_leads
           get_data_for_sidebar
@@ -90,10 +91,11 @@ class LeadsController < EntitiesController
   #----------------------------------------------------------------------------
   def update
     respond_with(@lead) do |format|
-      if @lead.update_with_permissions(params[:lead], params[:users])
+      # Must set access before user_ids, because user_ids= method depends on access value.
+      @lead.access = params[:lead][:access] if params[:lead][:access]
+      if @lead.update_with_lead_counters(params[:lead])
         update_sidebar
       else
-        @users = User.except(@current_user)
         @campaigns = Campaign.my.order('name')
       end
     end
@@ -113,10 +115,9 @@ class LeadsController < EntitiesController
   # GET /leads/1/convert
   #----------------------------------------------------------------------------
   def convert
-    @users = User.except(@current_user)
-    @account = Account.new(:user => @current_user, :name => @lead.company, :access => "Lead")
+    @account = Account.new(:user => current_user, :name => @lead.company, :access => "Lead")
     @accounts = Account.my.order('name')
-    @opportunity = Opportunity.new(:user => @current_user, :access => "Lead", :stage => "prospecting", :campaign => @lead.campaign, :source => @lead.source)
+    @opportunity = Opportunity.new(:user => current_user, :access => "Lead", :stage => "prospecting", :campaign => @lead.campaign, :source => @lead.source)
 
     if params[:previous].to_s =~ /(\d+)\z/
       @previous = Lead.my.find_by_id($1) || $1.to_i
@@ -128,7 +129,6 @@ class LeadsController < EntitiesController
   # PUT /leads/1/promote
   #----------------------------------------------------------------------------
   def promote
-    @users = User.except(@current_user)
     @account, @opportunity, @contact = @lead.promote(params)
     @accounts = Account.my.order('name')
     @stage = Setting.unroll(:opportunity_stage)
@@ -167,45 +167,41 @@ class LeadsController < EntitiesController
   #----------------------------------------------------------------------------
   # Handled by ApplicationController :auto_complete
 
-  # GET /leads/options                                                     AJAX
-  #----------------------------------------------------------------------------
-  def options
-    unless params[:cancel].true?
-      @per_page = @current_user.pref[:leads_per_page] || Lead.per_page
-      @outline  = @current_user.pref[:leads_outline]  || Lead.outline
-      @sort_by  = @current_user.pref[:leads_sort_by]  || Lead.sort_by
-      @naming   = @current_user.pref[:leads_naming]   || Lead.first_name_position
-    end
-  end
 
   # POST /leads/redraw                                                     AJAX
   #----------------------------------------------------------------------------
   def redraw
-    @current_user.pref[:leads_per_page] = params[:per_page] if params[:per_page]
-    @current_user.pref[:leads_outline]  = params[:outline]  if params[:outline]
+    current_user.pref[:leads_per_page] = params[:per_page] if params[:per_page]
 
     # Sorting and naming only: set the same option for Contacts if the hasn't been set yet.
     if params[:sort_by]
-      @current_user.pref[:leads_sort_by] = Lead::sort_by_map[params[:sort_by]]
+      current_user.pref[:leads_sort_by] = Lead::sort_by_map[params[:sort_by]]
       if Contact::sort_by_fields.include?(params[:sort_by])
-        @current_user.pref[:contacts_sort_by] ||= Contact::sort_by_map[params[:sort_by]]
+        current_user.pref[:contacts_sort_by] ||= Contact::sort_by_map[params[:sort_by]]
       end
     end
     if params[:naming]
-      @current_user.pref[:leads_naming] = params[:naming]
-      @current_user.pref[:contacts_naming] ||= params[:naming]
+      current_user.pref[:leads_naming] = params[:naming]
+      current_user.pref[:contacts_naming] ||= params[:naming]
     end
 
-    @leads = get_leads(:page => 1) # Start one the first page.
-    render :index
+    @leads = get_leads(:page => 1, :per_page => params[:per_page]) # Start one the first page.
+    set_options # Refresh options
+    
+    respond_with(@leads) do |format|
+      format.js { render :index }
+    end
   end
 
   # POST /leads/filter                                                     AJAX
   #----------------------------------------------------------------------------
   def filter
     session[:leads_filter] = params[:status]
-    @leads = get_leads(:page => 1) # Start one the first page.
-    render :index
+    @leads = get_leads(:page => 1, :per_page => params[:per_page]) # Start one the first page.
+    
+    respond_with(@leads) do |format|
+      format.js { render :index }
+    end
   end
 
 private
@@ -218,6 +214,11 @@ private
     @campaigns = Campaign.my.order('name')
   end
 
+  def set_options
+    super
+    @naming = (current_user.pref[:leads_naming] || Lead.first_name_position) unless params[:cancel].true?
+  end
+
   #----------------------------------------------------------------------------
   def respond_to_destroy(method)
     if method == :ajax

data/app/controllers/entities/opportunities_controller.rb

@@ -23,27 +23,27 @@ class OpportunitiesController < EntitiesController
   # GET /opportunities
   #----------------------------------------------------------------------------
   def index
-    @opportunities = get_opportunities(:page => params[:page])
-    respond_with(@opportunities)
+    @opportunities = get_opportunities(:page => params[:page], :per_page => params[:per_page])
+
+    respond_with @opportunities do |format|
+      format.xls { render :layout => 'header' }
+    end
   end
 
   # GET /opportunities/1
+  # AJAX /opportunities/1
   #----------------------------------------------------------------------------
   def show
-    respond_with(@opportunity) do |format|
-      format.html do
-        @comment = Comment.new
-        @timeline = timeline(@opportunity)
-      end
-    end
+    @comment = Comment.new
+    @timeline = timeline(@opportunity)
+    respond_with(@opportunity)
   end
 
   # GET /opportunities/new
   #----------------------------------------------------------------------------
   def new
-    @opportunity.attributes = {:user => @current_user, :stage => "prospecting", :access => Setting.default_access}
-    @users       = User.except(@current_user)
-    @account     = Account.new(:user => @current_user, :access => Setting.default_access)
+    @opportunity.attributes = {:user => current_user, :stage => "prospecting", :access => Setting.default_access, :assigned_to => nil}
+    @account     = Account.new(:user => current_user, :access => Setting.default_access)
     @accounts    = Account.my.order('name')
 
     if params[:related]
@@ -61,8 +61,7 @@ class OpportunitiesController < EntitiesController
   # GET /opportunities/1/edit                                              AJAX
   #----------------------------------------------------------------------------
   def edit
-    @users = User.except(@current_user)
-    @account  = @opportunity.account || Account.new(:user => @current_user)
+    @account  = @opportunity.account || Account.new(:user => current_user)
     @accounts = Account.my.order('name')
 
     if params[:previous].to_s =~ /(\d+)\z/
@@ -75,8 +74,10 @@ class OpportunitiesController < EntitiesController
   # POST /opportunities
   #----------------------------------------------------------------------------
   def create
+    @comment_body = params[:comment_body]
     respond_with(@opportunity) do |format|
       if @opportunity.save_with_account_and_permissions(params)
+        @opportunity.add_comment_by_user(@comment_body, current_user)
         if called_from_index_page?
           @opportunities = get_opportunities
           get_data_for_sidebar
@@ -86,7 +87,6 @@ class OpportunitiesController < EntitiesController
           get_data_for_sidebar(:campaign)
         end
       else
-        @users = User.except(@current_user)
         @accounts = Account.my.order('name')
         unless params[:account][:id].blank?
           @account = Account.find(params[:account][:id])
@@ -94,7 +94,7 @@ class OpportunitiesController < EntitiesController
           if request.referer =~ /\/accounts\/(.+)$/
             @account = Account.find($1) # related account
           else
-            @account = Account.new(:user => @current_user)
+            @account = Account.new(:user => current_user)
           end
         end
         @contact = Contact.find(params[:contact]) unless params[:contact].blank?
@@ -116,12 +116,11 @@ class OpportunitiesController < EntitiesController
           get_data_for_sidebar(:campaign)
         end
       else
-        @users = User.except(@current_user)
         @accounts = Account.my.order('name')
         if @opportunity.account
           @account = Account.find(@opportunity.account.id)
         else
-          @account = Account.new(:user => @current_user)
+          @account = Account.new(:user => current_user)
         end
       end
     end
@@ -155,28 +154,24 @@ class OpportunitiesController < EntitiesController
   #----------------------------------------------------------------------------
   # Handled by ApplicationController :auto_complete
 
-  # GET /opportunities/options                                             AJAX
-  #----------------------------------------------------------------------------
-  def options
-    unless params[:cancel].true?
-      @per_page = @current_user.pref[:opportunities_per_page] || Opportunity.per_page
-      @outline  = @current_user.pref[:opportunities_outline]  || Opportunity.outline
-      @sort_by  = @current_user.pref[:opportunities_sort_by]  || Opportunity.sort_by
-    end
-  end
-
   # POST /opportunities/redraw                                             AJAX
   #----------------------------------------------------------------------------
   def redraw
-    @opportunities = get_opportunities(:page => 1)
-    render :index
+    @opportunities = get_opportunities(:page => 1, :per_page => params[:per_page])
+    set_options # Refresh options
+    
+    respond_with(@opportunities) do |format|
+      format.js { render :index }
+    end
   end
 
   # POST /opportunities/filter                                             AJAX
   #----------------------------------------------------------------------------
   def filter
-    @opportunities = get_opportunities(:page => 1)
-    render :index
+    @opportunities = get_opportunities(:page => 1, :per_page => params[:per_page])
+    respond_with(@opportunities) do |format|
+      format.js { render :index }
+    end
   end
 
 private
@@ -226,9 +221,8 @@ private
 
   #----------------------------------------------------------------------------
   def set_params
-    @current_user.pref[:opportunities_per_page] = params[:per_page] if params[:per_page]
-    @current_user.pref[:opportunities_outline]  = params[:outline]  if params[:outline]
-    @current_user.pref[:opportunities_sort_by]  = Opportunity::sort_by_map[params[:sort_by]] if params[:sort_by]
+    current_user.pref[:opportunities_per_page] = params[:per_page] if params[:per_page]
+    current_user.pref[:opportunities_sort_by]  = Opportunity::sort_by_map[params[:sort_by]] if params[:sort_by]
     session[:opportunities_filter] = params[:stage] if params[:stage]
   end
 end