fat_free_crm 0.11.3 → 0.11.4

data/app/controllers/admin/application_controller.rb

@@ -34,7 +34,7 @@ private
   #----------------------------------------------------------------------------
   def require_admin_user
     require_user
-    if @current_user && !@current_user.admin?
+    if current_user && !current_user.admin?
       flash[:notice] = t(:msg_require_admin)
       redirect_to root_path
     end

data/app/controllers/admin/field_groups_controller.rb

@@ -17,6 +17,8 @@
 
 class Admin::FieldGroupsController < Admin::ApplicationController
 
+  helper 'admin/fields'
+
   # GET /admin/field_groups/new
   # GET /admin/field_groups/new.xml                                        AJAX
   #----------------------------------------------------------------------------

data/app/controllers/admin/fields_controller.rb

@@ -18,7 +18,7 @@
 class Admin::FieldsController < Admin::ApplicationController
   before_filter "set_current_tab('admin/fields')", :only => [ :index ]
 
-  load_resource
+  load_resource :except => [:create, :subform]
 
   # GET /fields
   # GET /fields.xml                                                      HTML
@@ -37,38 +37,46 @@ class Admin::FieldsController < Admin::ApplicationController
   # GET /fields/new.xml                                                  AJAX
   #----------------------------------------------------------------------------
   def new
-    @field = CustomField.new(:field_group_id => params[:field_group_id])
-
-    respond_with(@custom_field)
+    @field = Field.new
+    respond_with(@field)
   end
 
   # GET /fields/1/edit                                                   AJAX
   #----------------------------------------------------------------------------
   def edit
     @field = Field.find(params[:id])
-
-    if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Field.find_by_id($1) || $1.to_i
-    end
-
-    respond_with(@field)
+    respond_with(@field)    
   end
 
   # POST /fields
   # POST /fields.xml                                                     AJAX
   #----------------------------------------------------------------------------
   def create
-    @field = CustomField.create(params[:field])
+    as = params[:field][:as]
+    @field = 
+      if as =~ /pair/
+        CustomFieldPair.create_pair(params).first
+      elsif as.present?
+        klass = Field.lookup_class(as).classify.constantize
+        klass.create(params[:field])
+      else
+        Field.new(params[:field]).tap(&:valid?)
+      end
 
     respond_with(@field)
+
   end
 
   # PUT /fields/1
   # PUT /fields/1.xml                                                    AJAX
   #----------------------------------------------------------------------------
   def update
-    @field = Field.find(params[:id])
-    @field.update_attributes(params[:field])
+    if (params[:field][:as] =~ /pair/)
+      @field = CustomFieldPair.update_pair(params).first
+    else
+      @field = Field.find(params[:id])
+      @field.update_attributes(params[:field])
+    end
 
     respond_with(@field)
   end
@@ -77,7 +85,7 @@ class Admin::FieldsController < Admin::ApplicationController
   # DELETE /fields/1.xml                                        HTML and AJAX
   #----------------------------------------------------------------------------
   def destroy
-    @field = CustomField.find(params[:id])
+    @field = Field.find(params[:id])
     @field.destroy
 
     respond_with(@field)
@@ -95,8 +103,24 @@ class Admin::FieldsController < Admin::ApplicationController
 
     render :nothing => true
   end
-
-  # POST /fields/auto_complete/query                                     AJAX
+  
+  # GET /fields/subform
   #----------------------------------------------------------------------------
-  # Handled by before_filter :auto_complete, :only => :auto_complete
+  def subform
+    field = params[:field]
+    as = field[:as]
+
+    @field = if (id = field[:id]).present?
+        Field.find(id).tap{|f| f.as = as}
+      else
+        field_group_id = field[:field_group_id]
+        klass = Field.lookup_class(as).classify.constantize
+        klass.new(:field_group_id => field_group_id, :as => as)
+      end
+
+    respond_with(@field) do |format|
+      format.html { render :partial => 'admin/fields/subform' }
+    end  
+  end
+  
 end

data/app/controllers/admin/groups_controller.rb

@@ -0,0 +1,70 @@
+# 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 Admin::GroupsController < Admin::ApplicationController
+  before_filter "set_current_tab('admin/groups')", :only => [ :index, :show ]
+
+  load_resource
+
+  # GET /groups
+  #----------------------------------------------------------------------------
+  def index
+    @groups = @groups.unscoped.paginate(:page => params[:page])
+  end
+
+  # GET /groups/1
+  #----------------------------------------------------------------------------
+  def show
+    respond_with(@group)
+  end
+
+  # GET /groups/new
+  #----------------------------------------------------------------------------
+  def new
+    respond_with(@group)
+  end
+
+  # GET /groups/1/edit
+  #----------------------------------------------------------------------------
+  def edit
+    respond_with(@group)
+  end
+
+  # POST /groups
+  #----------------------------------------------------------------------------
+  def create
+    @group.update_attributes(params[:group])
+
+    respond_with(@group)
+  end
+
+  # PUT /groups/1
+  #----------------------------------------------------------------------------
+  def update
+    @group.update_attributes(params[:group])
+
+    respond_with(@group)
+  end
+
+  # DELETE /groups/1
+  #----------------------------------------------------------------------------
+  def destroy
+    @group.destroy
+
+    respond_with(@group)
+  end
+end

data/app/controllers/admin/tags_controller.rb

@@ -24,6 +24,7 @@ class Admin::TagsController < Admin::ApplicationController
   # GET /admin/tags.xml                                                   HTML
   #----------------------------------------------------------------------------
   def index
+    @tags = Tag.all
     respond_with(@tags)
   end
 

data/app/controllers/admin/users_controller.rb

@@ -18,7 +18,7 @@
 class Admin::UsersController < Admin::ApplicationController
   before_filter "set_current_tab('admin/users')", :only => [ :index, :show ]
 
-  load_resource
+  load_resource :except => [:create]
 
   # GET /admin/users
   # GET /admin/users.xml                                                   HTML
@@ -57,10 +57,10 @@ class Admin::UsersController < Admin::ApplicationController
   #----------------------------------------------------------------------------
   def create
     params[:user][:password_confirmation] = nil if params[:user][:password_confirmation].blank?
+    admin = params[:user].delete(:admin)
     @user = User.new(params[:user])
-    @user.admin = (params[:user][:admin] == "1")
+    @user.admin = (admin == "1") unless admin.nil?
     @user.save_without_session_maintenance
-    @users = get_users
 
     respond_with(@user)
   end
@@ -70,9 +70,11 @@ class Admin::UsersController < Admin::ApplicationController
   #----------------------------------------------------------------------------
   def update
     params[:user][:password_confirmation] = nil if params[:user][:password_confirmation].blank?
+    admin = params[:user].delete(:admin)
     @user = User.find(params[:id])
-    @user.update_attributes(params[:user])
-    @user.admin = (params[:user][:admin] == "1")
+    @user.attributes = params[:user]
+    @user.admin = (admin == "1") unless admin.nil?
+    @user.save_without_session_maintenance
 
     respond_with(@user)
   end
@@ -102,7 +104,7 @@ class Admin::UsersController < Admin::ApplicationController
   # PUT /admin/users/1/suspend.xml                                         AJAX
   #----------------------------------------------------------------------------
   def suspend
-    @user.update_attribute(:suspended_at, Time.now) if @user != @current_user
+    @user.update_attribute(:suspended_at, Time.now) if @user != current_user
 
     respond_with(@user)
   end
@@ -134,4 +136,3 @@ private
     scope
   end
 end
-

data/app/controllers/application_controller.rb

@@ -38,21 +38,42 @@ class ApplicationController < ActionController::Base
   #----------------------------------------------------------------------------
   def auto_complete
     @query = params[:auto_complete_query] || ''
-    @auto_complete = hook(:auto_complete, self, :query => @query, :user => @current_user)
+    @auto_complete = hook(:auto_complete, self, :query => @query, :user => current_user)
     if @auto_complete.empty?
-      @auto_complete = klass.my.text_search(@query).limit(10)
+      exclude_ids = auto_complete_ids_to_exclude(params[:related])
+      @auto_complete = klass.my.text_search(@query).search(:id_not_in => exclude_ids).result.limit(10)
     else
       @auto_complete = @auto_complete.last
     end
+
     session[:auto_complete] = controller_name.to_sym
     respond_to do |format|
       format.any(:js, :html)   { render :partial => 'auto_complete' }
-      format.json { render :json => @auto_complete.inject({}){|h,a| h[a.id] = a.name; h } }
+      format.json { render :json => @auto_complete.inject({}){|h,a|
+        h[a.id] = a.respond_to?(:full_name) ? a.full_name : a.name; h
+      }}
     end
   end
 
 private
 
+  #
+  # Takes { :related => 'campaigns/7' } or { :related => '5' }
+  #   and returns array of object ids that should be excluded from search
+  #   assumes controller_name is an method on 'related' class that returns a collection
+  #----------------------------------------------------------------------------
+  def auto_complete_ids_to_exclude(related)
+    return [] if related.blank?
+    return [related.to_i].compact unless related.index('/')
+    related_class, id = related.split('/')
+    obj = related_class.classify.constantize.find_by_id(id)
+    if obj and obj.respond_to?(controller_name)
+      obj.send(controller_name).map(&:id)
+    else
+      []
+    end
+  end
+
   #----------------------------------------------------------------------------
   def klass
     @klass ||= controller_name.classify.constantize
@@ -66,7 +87,11 @@ private
   #----------------------------------------------------------------------------
   def set_context
     Time.zone = ActiveSupport::TimeZone[session[:timezone_offset]] if session[:timezone_offset]
-    I18n.locale = Setting.locale if Setting.locale
+    if current_user.present? and (locale = current_user.preference[:locale]).present?
+      I18n.locale = locale
+    elsif Setting.locale.present?
+      I18n.locale = Setting.locale
+    end
   end
 
   #----------------------------------------------------------------------------
@@ -150,7 +175,8 @@ private
   # Proxy current page for any of the controllers by storing it in a session.
   #----------------------------------------------------------------------------
   def current_page=(page)
-    @current_page = session[:"#{controller_name}_current_page"] = page.to_i
+    p = page.to_i
+    @current_page = session[:"#{controller_name}_current_page"] = (p.zero? ? 1 : p)
   end
 
   #----------------------------------------------------------------------------
@@ -162,6 +188,9 @@ private
   # Proxy current search query for any of the controllers by storing it in a session.
   #----------------------------------------------------------------------------
   def current_query=(query)
+    if session[:"#{controller_name}_current_query"].to_s != query.to_s # nil.to_s == ""
+      self.current_page = params[:page] # reset paging otherwise results might be hidden, defaults to 1 if nil
+    end
     @current_query = session[:"#{controller_name}_current_query"] = query
   end
 

data/app/controllers/comments_controller.rb

@@ -18,7 +18,7 @@
 class CommentsController < ApplicationController
   before_filter :require_user
 
-  COMMENTABLE = %w(account_id campaign_id contact_id lead_id opportunity_id task_id).freeze
+
 
   # GET /comments
   # GET /comments.json
@@ -113,8 +113,7 @@ private
 
   #----------------------------------------------------------------------------
   def extract_commentable_name(params)
-    commentable = (params.keys & COMMENTABLE).first
-    commentable.sub('_id', '') if commentable
+    params.keys.detect {|x| x =~ /_id$/ }.try(:sub, /_id$/, '')
   end
 
   #----------------------------------------------------------------------------

data/app/controllers/entities/accounts_controller.rb

@@ -21,27 +21,27 @@ class AccountsController < EntitiesController
   # GET /accounts
   #----------------------------------------------------------------------------
   def index
-    @accounts = get_accounts(:page => params[:page])
-    respond_with(@accounts)
+    @accounts = get_accounts(:page => params[:page], :per_page => params[:per_page])
+
+    respond_with @accounts do |format|
+      format.xls { render :layout => 'header' }
+    end
   end
 
   # GET /accounts/1
+  # AJAX /accounts/1
   #----------------------------------------------------------------------------
   def show
-    respond_with(@account) do |format|
-      format.html do
-        @stage = Setting.unroll(:opportunity_stage)
-        @comment = Comment.new
-        @timeline = timeline(@account)
-      end
-    end
+    @stage = Setting.unroll(:opportunity_stage)
+    @comment = Comment.new
+    @timeline = timeline(@account)
+    respond_with(@account)
   end
 
   # GET /accounts/new
   #----------------------------------------------------------------------------
   def new
-    @account.attributes = {:user => @current_user, :access => Setting.default_access}
-    @users = User.except(@current_user)
+    @account.attributes = {:user => current_user, :access => Setting.default_access, :assigned_to => nil}
 
     if params[:related]
       model, id = params[:related].split('_')
@@ -54,7 +54,6 @@ class AccountsController < EntitiesController
   # GET /accounts/1/edit                                                   AJAX
   #----------------------------------------------------------------------------
   def edit
-    @users = User.except(@current_user)
     if params[:previous].to_s =~ /(\d+)\z/
       @previous = Account.my.find_by_id($1) || $1.to_i
     end
@@ -65,10 +64,10 @@ class AccountsController < EntitiesController
   # POST /accounts
   #----------------------------------------------------------------------------
   def create
-    @users = User.except(@current_user)
-
+    @comment_body = params[:comment_body]
     respond_with(@account) do |format|
-      if @account.save_with_permissions(params[:users])
+      if @account.save
+        @account.add_comment_by_user(@comment_body, current_user)
         # None: account can only be created from the Accounts index page, so we
         # don't have to check whether we're on the index page.
         @accounts = get_accounts
@@ -81,11 +80,9 @@ class AccountsController < EntitiesController
   #----------------------------------------------------------------------------
   def update
     respond_with(@account) do |format|
-      if @account.update_with_permissions(params[:account], params[:users])
-        get_data_for_sidebar
-      else
-        @users = User.except(@current_user) # Need it to redraw [Edit Account] form.
-      end
+      # Must set access before user_ids, because user_ids= method depends on access value.
+      @account.access = params[:account][:access] if params[:account][:access]
+      get_data_for_sidebar if @account.update_attributes(params[:account])
     end
   end
 
@@ -112,32 +109,28 @@ class AccountsController < EntitiesController
   #----------------------------------------------------------------------------
   # Handled by ApplicationController :auto_complete
 
-  # GET /accounts/options                                                  AJAX
-  #----------------------------------------------------------------------------
-  def options
-    unless params[:cancel].true?
-      @per_page = @current_user.pref[:accounts_per_page] || Account.per_page
-      @outline  = @current_user.pref[:accounts_outline]  || Account.outline
-      @sort_by  = @current_user.pref[:accounts_sort_by]  || Account.sort_by
-    end
-  end
-
   # POST /accounts/redraw                                                  AJAX
   #----------------------------------------------------------------------------
   def redraw
-    @current_user.pref[:accounts_per_page] = params[:per_page] if params[:per_page]
-    @current_user.pref[:accounts_outline]  = params[:outline]  if params[:outline]
-    @current_user.pref[:accounts_sort_by]  = Account::sort_by_map[params[:sort_by]] if params[:sort_by]
-    @accounts = get_accounts(:page => 1)
-    render :index
+    current_user.pref[:accounts_per_page] = params[:per_page] if params[:per_page]
+    current_user.pref[:accounts_sort_by]  = Account::sort_by_map[params[:sort_by]] if params[:sort_by]
+    @accounts = get_accounts(:page => 1, :per_page => params[:per_page])
+    set_options # Refresh options
+    
+    respond_with(@accounts) do |format|
+      format.js { render :index }
+    end
   end
 
   # POST /accounts/filter                                                  AJAX
   #----------------------------------------------------------------------------
   def filter
     session[:accounts_filter] = params[:category]
-    @accounts = get_accounts(:page => 1)
-    render :index
+    @accounts = get_accounts(:page => 1, :per_page => params[:per_page])
+    
+    respond_with(@accounts) do |format|
+      format.js { render :index }
+    end
   end
 
 private