fat_free_crm 0.11.1 → 0.11.2

data/app/controllers/comments_controller.rb

@@ -18,9 +18,6 @@
 class CommentsController < ApplicationController
   before_filter :require_user
 
-  respond_to :js
-  respond_to :json, :xml, :except => :edit
-
   COMMENTABLE = %w(account_id campaign_id contact_id lead_id opportunity_id task_id).freeze
 
   # GET /comments
@@ -56,13 +53,12 @@ class CommentsController < ApplicationController
 
     if @commentable
       update_commentable_session
-      @commentable.classify.constantize.my.find(params[:"#{@commentable}_id"])
+      unless @commentable.classify.constantize.my.find_by_id(params[:"#{@commentable}_id"])
+        respond_to_related_not_found(@commentable) and return
+      end
     end
 
     respond_with(@comment)
-
-  rescue ActiveRecord::RecordNotFound # Kicks in if commentable asset was not found.
-    respond_to_related_not_found(@commentable, :js)
   end
 
   # GET /comments/1/edit                                                   AJAX
@@ -70,14 +66,10 @@ class CommentsController < ApplicationController
   def edit
     @comment = Comment.find(params[:id])
 
-    if @comment.commentable
-      @comment.commentable_type.constantize.my.find(@comment.commentable.id)
-    else
-      raise ActiveRecord::RecordNotFound
+    model, id = @comment.commentable_type, @comment.commentable_id
+    unless model.constantize.my.find_by_id(id)
+      respond_to_related_not_found(model.downcase)
     end
-
-  rescue ActiveRecord::RecordNotFound # Kicks in if commentable asset was not found.
-    respond_to_related_not_found(params[:comment][:commentable_type].downcase, :js, :xml)
   end
 
   # POST /comments
@@ -88,17 +80,13 @@ class CommentsController < ApplicationController
     @comment = Comment.new(params[:comment])
 
     # Make sure commentable object exists and is accessible to the current user.
-    if @comment.commentable
-      @comment.commentable_type.constantize.my.find(@comment.commentable.id)
-    else
-      raise ActiveRecord::RecordNotFound
+    model, id = @comment.commentable_type, @comment.commentable_id
+    unless model.constantize.my.find_by_id(id)
+      respond_to_related_not_found(model.downcase)
     end
 
     @comment.save
     respond_with(@comment)
-
-  rescue ActiveRecord::RecordNotFound # Kicks in if commentable asset was not found.
-    respond_to_related_not_found(params[:comment][:commentable_type].downcase, :js, :xml)
   end
 
   # PUT /comments/1
@@ -109,9 +97,6 @@ class CommentsController < ApplicationController
     @comment = Comment.find(params[:id])
     @comment.update_attributes(params[:comment])
     respond_with(@comment)
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:js, :json, :xml)
   end
 
   # DELETE /comments/1
@@ -122,16 +107,14 @@ class CommentsController < ApplicationController
     @comment = Comment.find(params[:id])
     @comment.destroy
     respond_with(@comment)
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:html, :js, :json, :xml)
   end
 
-  private
+private
+
   #----------------------------------------------------------------------------
   def extract_commentable_name(params)
     commentable = (params.keys & COMMENTABLE).first
-    commentable.sub("_id", "") if commentable
+    commentable.sub('_id', '') if commentable
   end
 
   #----------------------------------------------------------------------------

data/app/controllers/emails_controller.rb

@@ -18,8 +18,6 @@
 class EmailsController < ApplicationController
   before_filter :require_user
 
-  respond_to :js, :json, :xml
-
   # GET /email
   # GET /email.xml                                              not implemented
   #----------------------------------------------------------------------------
@@ -56,9 +54,7 @@ class EmailsController < ApplicationController
   def destroy
     @email = Email.find(params[:id])
     @email.destroy
-    respond_with(@email)
 
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:html, :js, :json, :xml)
+    respond_with(@email)
   end
 end

data/app/controllers/entities/accounts_controller.rb

@@ -28,8 +28,6 @@ class AccountsController < EntitiesController
   # GET /accounts/1
   #----------------------------------------------------------------------------
   def show
-    @account = Account.my.find(params[:id])
-
     respond_with(@account) do |format|
       format.html do
         @stage = Setting.unroll(:opportunity_stage)
@@ -37,18 +35,16 @@ class AccountsController < EntitiesController
         @timeline = timeline(@account)
       end
     end
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:html, :json, :xml)
   end
 
   # GET /accounts/new
   #----------------------------------------------------------------------------
   def new
-    @account = Account.new(:user => @current_user, :access => Setting.default_access)
+    @account.attributes = {:user => @current_user, :access => Setting.default_access}
     @users = User.except(@current_user)
+
     if params[:related]
-      model, id = params[:related].split("_")
+      model, id = params[:related].split('_')
       instance_variable_set("@#{model}", model.classify.constantize.find(id))
     end
 
@@ -58,22 +54,17 @@ class AccountsController < EntitiesController
   # GET /accounts/1/edit                                                   AJAX
   #----------------------------------------------------------------------------
   def edit
-    @account = Account.my.find(params[:id])
     @users = User.except(@current_user)
     if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Account.my.find($1)
+      @previous = Account.my.find_by_id($1) || $1.to_i
     end
-    respond_with(@account)
 
-  rescue ActiveRecord::RecordNotFound
-    @previous ||= $1.to_i
-    respond_to_not_found(:js) unless @account
+    respond_with(@account)
   end
 
   # POST /accounts
   #----------------------------------------------------------------------------
   def create
-    @account = Account.new(params[:account])
     @users = User.except(@current_user)
 
     respond_with(@account) do |format|
@@ -89,8 +80,6 @@ class AccountsController < EntitiesController
   # PUT /accounts/1
   #----------------------------------------------------------------------------
   def update
-    @account = Account.my.find(params[:id])
-
     respond_with(@account) do |format|
       if @account.update_with_permissions(params[:account], params[:users])
         get_data_for_sidebar
@@ -98,33 +87,26 @@ class AccountsController < EntitiesController
         @users = User.except(@current_user) # Need it to redraw [Edit Account] form.
       end
     end
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:js, :json, :xml)
   end
 
   # DELETE /accounts/1
   #----------------------------------------------------------------------------
   def destroy
-    @account = Account.my.find(params[:id])
-    @account.destroy if @account
+    @account.destroy
 
     respond_with(@account) do |format|
       format.html { respond_to_destroy(:html) }
       format.js   { respond_to_destroy(:ajax) }
     end
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:html, :js, :json, :xml)
   end
 
   # PUT /accounts/1/attach
   #----------------------------------------------------------------------------
-  # Handled by ApplicationController :attach
+  # Handled by EntitiesController :attach
 
   # PUT /accounts/1/discard
   #----------------------------------------------------------------------------
-  # Handled by ApplicationController :discard
+  # Handled by EntitiesController :discard
 
   # POST /accounts/auto_complete/query                                     AJAX
   #----------------------------------------------------------------------------
@@ -153,23 +135,22 @@ class AccountsController < EntitiesController
   # POST /accounts/filter                                                  AJAX
   #----------------------------------------------------------------------------
   def filter
-    session[:filter_by_account_category] = params[:category]
+    session[:accounts_filter] = params[:category]
     @accounts = get_accounts(:page => 1)
     render :index
   end
 
-  private
+private
+
   #----------------------------------------------------------------------------
-  def get_accounts(options = {})
-    get_list_of_records(Account, options.merge!(:filter => :filter_by_account_category))
-  end
+  alias :get_accounts :get_list_of_records
 
   #----------------------------------------------------------------------------
   def respond_to_destroy(method)
     if method == :ajax
       @accounts = get_accounts
       get_data_for_sidebar
-      if @accounts.blank?
+      if @accounts.empty?
         @accounts = get_accounts(:page => current_page - 1) if current_page > 1
         render :index and return
       end

data/app/controllers/entities/campaigns_controller.rb

@@ -28,8 +28,6 @@ class CampaignsController < EntitiesController
   # GET /campaigns/1
   #----------------------------------------------------------------------------
   def show
-    @campaign = Campaign.my.find(params[:id])
-
     respond_with(@campaign) do |format|
       format.html do
         @stage = Setting.unroll(:opportunity_stage)
@@ -37,9 +35,6 @@ class CampaignsController < EntitiesController
         @timeline = timeline(@campaign)
       end
     end
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:html, :json, :xml)
   end
 
   # GET /campaigns/new
@@ -47,11 +42,16 @@ class CampaignsController < EntitiesController
   # GET /campaigns/new.xml                                                 AJAX
   #----------------------------------------------------------------------------
   def new
-    @campaign = Campaign.new(:user => @current_user, :access => Setting.default_access)
+    @campaign.attributes = {:user => @current_user, :access => Setting.default_access}
     @users = User.except(@current_user)
+
     if params[:related]
-      model, id = params[:related].split("_")
-      instance_variable_set("@#{model}", model.classify.constantize.find(id))
+      model, id = params[:related].split('_')
+      if related = model.classify.constantize.my.find_by_id(id)
+        instance_variable_set("@#{model}", related)
+      else
+        respond_to_related_not_found(model) and return
+      end
     end
 
     respond_with(@campaign)
@@ -60,22 +60,17 @@ class CampaignsController < EntitiesController
   # GET /campaigns/1/edit                                                  AJAX
   #----------------------------------------------------------------------------
   def edit
-    @campaign = Campaign.my.find(params[:id])
     @users = User.except(@current_user)
     if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Campaign.my.find($1)
+      @previous = Campaign.my.find_by_id($1) || $1.to_i
     end
-    respond_with(@campaign)
 
-  rescue ActiveRecord::RecordNotFound
-    @previous ||= $1.to_i
-    respond_to_not_found(:js) unless @campaign
+    respond_with(@campaign)
   end
 
   # POST /campaigns
   #----------------------------------------------------------------------------
   def create
-    @campaign = Campaign.new(params[:campaign])
     @users = User.except(@current_user)
 
     respond_with(@campaign) do |format|
@@ -89,8 +84,6 @@ class CampaignsController < EntitiesController
   # PUT /campaigns/1
   #----------------------------------------------------------------------------
   def update
-    @campaign = Campaign.my.find(params[:id])
-
     respond_with(@campaign) do |format|
       if @campaign.update_with_permissions(params[:campaign], params[:users])
         get_data_for_sidebar if called_from_index_page?
@@ -98,33 +91,26 @@ class CampaignsController < EntitiesController
         @users = User.except(@current_user) # Need it to redraw [Edit Campaign] form.
       end
     end
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:js, :json, :xml)
   end
 
   # DELETE /campaigns/1
   #----------------------------------------------------------------------------
   def destroy
-    @campaign = Campaign.my.find(params[:id])
-    @campaign.destroy if @campaign
+    @campaign.destroy
 
     respond_with(@campaign) do |format|
       format.html { respond_to_destroy(:html) }
       format.js   { respond_to_destroy(:ajax) }
     end
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:html, :js, :json, :xml)
   end
 
   # PUT /campaigns/1/attach
   #----------------------------------------------------------------------------
-  # Handled by ApplicationController :attach
+  # Handled by EntitiesController :attach
 
   # PUT /campaigns/1/discard
   #----------------------------------------------------------------------------
-  # Handled by ApplicationController :discard
+  # Handled by EntitiesController :discard
 
   # POST /campaigns/auto_complete/query                                    AJAX
   #----------------------------------------------------------------------------
@@ -153,16 +139,15 @@ class CampaignsController < EntitiesController
   # POST /campaigns/filter                                                 AJAX
   #----------------------------------------------------------------------------
   def filter
-    session[:filter_by_campaign_status] = params[:status]
+    session[:campaigns_filter] = params[:status]
     @campaigns = get_campaigns(:page => 1)
     render :index
   end
 
-  private
+private
+
   #----------------------------------------------------------------------------
-  def get_campaigns(options = {})
-    get_list_of_records(Campaign, options.merge!(:filter => :filter_by_campaign_status))
-  end
+  alias :get_campaigns :get_list_of_records
 
   #----------------------------------------------------------------------------
   def respond_to_destroy(method)

data/app/controllers/entities/contacts_controller.rb

@@ -29,8 +29,6 @@ class ContactsController < EntitiesController
   # GET /contacts/1
   #----------------------------------------------------------------------------
   def show
-    @contact = Contact.my.find(params[:id])
-
     respond_with(@contact) do |format|
       format.html do
         @stage = Setting.unroll(:opportunity_stage)
@@ -38,46 +36,40 @@ class ContactsController < EntitiesController
         @timeline = timeline(@contact)
       end
     end
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:html, :json, :xml)
   end
 
   # GET /contacts/new
   #----------------------------------------------------------------------------
   def new
-    @contact  = Contact.new(:user => current_user, :access => Setting.default_access)
-    @account  = Account.new(:user => current_user)
+    @contact.attributes = {:user => current_user, :access => Setting.default_access}
+    @account = Account.new(:user => current_user)
+
     if params[:related]
-      model, id = params[:related].split("_")
-      instance_variable_set("@#{model}", model.classify.constantize.my.find(id))
+      model, id = params[:related].split('_')
+      if related = model.classify.constantize.my.find_by_id(id)
+        instance_variable_set("@#{model}", related)
+      else
+        respond_to_related_not_found(model) and return
+      end
     end
-    respond_with(@contact)
 
-  rescue ActiveRecord::RecordNotFound # Kicks in if related asset was not found.
-    respond_to_related_not_found(model, :js) if model
+    respond_with(@contact)
   end
 
   # GET /contacts/1/edit                                                   AJAX
   #----------------------------------------------------------------------------
   def edit
-    @contact  = Contact.my.find(params[:id])
-    @account  = @contact.account || Account.new(:user => current_user)
+    @account = @contact.account || Account.new(:user => current_user)
     if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Contact.my.find($1)
+      @previous = Contact.my.find_by_id($1) || $1.to_i
     end
-    respond_with(@contact)
 
-  rescue ActiveRecord::RecordNotFound
-    @previous ||= $1.to_i
-    respond_to_not_found(:js) unless @contact
+    respond_with(@contact)
   end
 
   # POST /contacts
   #----------------------------------------------------------------------------
   def create
-    @contact = Contact.new(params[:contact])
-
     respond_with(@contact) do |format|
       if @contact.save_with_account_and_permissions(params)
         @contacts = get_contacts if called_from_index_page?
@@ -91,7 +83,7 @@ class ContactsController < EntitiesController
             @account = Account.new(:user => current_user)
           end
         end
-        @opportunity = Opportunity.find(params[:opportunity]) unless params[:opportunity].blank?
+        @opportunity = Opportunity.my.find(params[:opportunity]) unless params[:opportunity].blank?
       end
     end
   end
@@ -99,8 +91,6 @@ class ContactsController < EntitiesController
   # PUT /contacts/1
   #----------------------------------------------------------------------------
   def update
-    @contact = Contact.my.find(params[:id])
-
     respond_with(@contact) do |format|
       unless @contact.update_with_account_and_permissions(params)
         @users = User.except(current_user)
@@ -111,33 +101,26 @@ class ContactsController < EntitiesController
         end
       end
     end
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:js, :json, :xml)
   end
 
   # DELETE /contacts/1
   #----------------------------------------------------------------------------
   def destroy
-    @contact = Contact.my.find(params[:id])
-    @contact.destroy if @contact
+    @contact.destroy
 
     respond_with(@contact) do |format|
       format.html { respond_to_destroy(:html) }
       format.js   { respond_to_destroy(:ajax) }
     end
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:html, :js, :json, :xml)
   end
 
   # PUT /contacts/1/attach
   #----------------------------------------------------------------------------
-  # Handled by ApplicationController :attach
+  # Handled by EntitiesController :attach
 
   # POST /contacts/1/discard
   #----------------------------------------------------------------------------
-  # Handled by ApplicationController :discard
+  # Handled by EntitiesController :discard
 
   # POST /contacts/auto_complete/query                                     AJAX
   #----------------------------------------------------------------------------
@@ -178,12 +161,11 @@ class ContactsController < EntitiesController
 
   private
   #----------------------------------------------------------------------------
-  def get_contacts(options = {})
-    get_list_of_records(Contact, options)
-  end
+  alias :get_contacts :get_list_of_records
 
+  #----------------------------------------------------------------------------
   def get_accounts
-    @accounts = Account.my.order("name")
+    @accounts = Account.my.order('name')
   end
 
   #----------------------------------------------------------------------------